Merge branch 'smartcmd:main' into main

357 files changed, 28754 insertions, 15857 deletions

diff --git a/Minecraft.Client/Common/App_enums.h b/Minecraft.Client/Common/App_enums.h
index e8e0d147..15a17978 100644
--- a/Minecraft.Client/Common/App_enums.h
+++ b/Minecraft.Client/Common/App_enums.h
@@ -133,7 +133,9 @@ enum eGameSetting
 {
 	eGameSetting_MusicVolume=0,
 	eGameSetting_SoundFXVolume,
+	eGameSetting_RenderDistance,
 	eGameSetting_Gamma,
+	eGameSetting_FOV,
 	eGameSetting_Difficulty,
 	eGameSetting_Sensitivity_InGame,
 	eGameSetting_Sensitivity_InMenu,
diff --git a/Minecraft.Client/Common/App_structs.h b/Minecraft.Client/Common/App_structs.h
index a7552ec0..6a6e0354 100644
--- a/Minecraft.Client/Common/App_structs.h
+++ b/Minecraft.Client/Common/App_structs.h
@@ -65,8 +65,8 @@ typedef struct
 			// In-Menu sensitivity
 			unsigned char ucMenuSensitivity;
 			unsigned char ucInterfaceOpacity;
-			unsigned char ucPad02;//2 bytes of padding added here
-			unsigned char usPad03;
+			unsigned char ucPad02;  // 1 byte padding
+			unsigned char ucFov;
 
 			// Adding another bitmask flag for more settings for 1.8.2
 			unsigned int uiBitmaskValues;		// 0x00000001 - eGameSetting_Clouds - on
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index 534fc54d..cf140c78 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -25,7 +25,7 @@
 #include <vector>
 #include <memory>
 #include <mutex>
-#include "..\Filesystem\Filesystem.h"
+#include <lce_filesystem\lce_filesystem.h>
 
 #ifdef __ORBIS__
 #include <audioout.h>
@@ -57,7 +57,7 @@ void SoundEngine::updateSoundEffectVolume(float fVal) {}
 void SoundEngine::add(const wstring& name, File *file) {}
 void SoundEngine::addMusic(const wstring& name, File *file) {}
 void SoundEngine::addStreaming(const wstring& name, File *file) {}
-char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpaces) { return NULL; }
+char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpaces) { return nullptr; }
 bool SoundEngine::isStreamingWavebankReady() { return true; }
 void SoundEngine::playMusicTick() {};
 
@@ -103,7 +103,7 @@ char SoundEngine::m_szRedistName[]={"redist"};
 
 #endif
 
-char *SoundEngine::m_szStreamFileA[eStream_Max]=
+const char *SoundEngine::m_szStreamFileA[eStream_Max]=
 {
 	"calm1",
 	"calm2",
@@ -187,7 +187,7 @@ void SoundEngine::init(Options* pOptions)
     m_bSystemMusicPlaying = false;
 
     app.DebugPrintf("---miniaudio initialized\n");
-
+	
     return;
 }
 
@@ -260,16 +260,12 @@ void SoundEngine::updateMiniAudio()
             continue;
         }
 
-        float finalVolume = s->info.volume * m_MasterEffectsVolume;
-        if (finalVolume > 1.0f)
-            finalVolume = 1.0f;
+        float finalVolume = s->info.volume * m_MasterEffectsVolume * SFX_VOLUME_MULTIPLIER;
+        if (finalVolume > SFX_MAX_GAIN)
+            finalVolume = SFX_MAX_GAIN;
 
         ma_sound_set_volume(&s->sound, finalVolume);
-
-        if (!s->info.bUseSoundsPitchVal)
-        {
-            ma_sound_set_pitch(&s->sound, s->info.pitch);
-        }
+        ma_sound_set_pitch(&s->sound, s->info.pitch);
 
         if (s->info.bIs3D)
         {
@@ -338,7 +334,7 @@ void SoundEngine::tick(shared_ptr<Mob> *players, float a)
 		bool bListenerPostionSet = false;
 		for( size_t i = 0; i < MAX_LOCAL_PLAYERS; i++ )
 		{
-			if( players[i] != NULL )
+			if( players[i] != nullptr )
 			{
 				m_ListenerA[i].bValid=true;
 				F32 x,y,z;
@@ -405,7 +401,7 @@ SoundEngine::SoundEngine()
 	m_iMusicDelay=0;
 	m_validListenerCount=0; 
 
-	m_bHeardTrackA=NULL;
+	m_bHeardTrackA=nullptr;
 
 	// Start the streaming music playing some music from the overworld
 	SetStreamingSounds(eStream_Overworld_Calm1,eStream_Overworld_piano3,
@@ -474,67 +470,64 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
     char finalPath[256];
     sprintf_s(finalPath, "%s.wav", basePath);
 
-    if (!FileExists(finalPath))
-    {
-        int count = 0;
-
-        for (size_t i = 1; i < 32; i++)
-        {
-            char numberedFolder[256];
-            sprintf_s(numberedFolder, "%s%d", basePath, i);
-
-            DWORD attr = GetFileAttributesA(numberedFolder);
-
-            if (attr != INVALID_FILE_ATTRIBUTES &&
-                (attr & FILE_ATTRIBUTE_DIRECTORY))
-            {
-                count++;
-            }
-            else
-            {
-                break;
-            }
-        }
-
-        char chosenFolder[256];
-
-        if (count == 0)
-        {
-            sprintf_s(chosenFolder, "%s", basePath);
-        }
-        else
-        {
-            int chosen = (rand() % count) + 1;
-            sprintf_s(chosenFolder, "%s%d", basePath, chosen);
-        }
+	const char* extensions[] = { ".ogg", ".wav", ".mp3" };
+	size_t extCount = sizeof(extensions) / sizeof(extensions[0]);
+	bool found = false;
 
-        char searchPattern[256];
-        sprintf_s(searchPattern, "%s\\*.wav", chosenFolder);
+	for (size_t extIdx = 0; extIdx < extCount; extIdx++)
+	{
+		char basePlusExt[256];
+		sprintf_s(basePlusExt, "%s%s", basePath, extensions[extIdx]);
+		
+		DWORD attr = GetFileAttributesA(basePlusExt);
+		if (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY))
+		{
+			sprintf_s(finalPath, "%s", basePlusExt);
+			found = true;
+			break;
+		}
+	}
 
-        WIN32_FIND_DATAA findData;
-        HANDLE hFind = FindFirstFileA(searchPattern, &findData);
+	if (!found)
+	{
+		int count = 0;
 
-		const char* extensions[] = { ".ogg", ".wav", ".mp3" };
-		size_t extCount = sizeof(extensions) / sizeof(extensions[0]);
-		bool found = false;
-		for (size_t i = 0; i < extCount; i++)
+		for (size_t extIdx = 0; extIdx < extCount; extIdx++)
 		{
-			sprintf_s(searchPattern, "%s\\*%s", chosenFolder, extensions[i]);
-			hFind = FindFirstFileA(searchPattern, &findData);
-			if (hFind != INVALID_HANDLE_VALUE)
+			for (size_t i = 1; i < 32; i++)
 			{
-				found = true;
-				break;
+				char numberedPath[256];
+				sprintf_s(numberedPath, "%s%d%s", basePath, i, extensions[extIdx]);
+				
+				DWORD attr = GetFileAttributesA(numberedPath);
+				if (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY))
+				{
+					count = i;
+				}
 			}
 		}
-		if (hFind == INVALID_HANDLE_VALUE)
+
+		if (count > 0)
 		{
-			app.DebugPrintf("No sound files found in %s\n", chosenFolder);
-			return;
+			int chosen = (rand() % count) + 1;
+			for (size_t extIdx = 0; extIdx < extCount; extIdx++)
+			{
+				char numberedPath[256];
+				sprintf_s(numberedPath, "%s%d%s", basePath, chosen, extensions[extIdx]);
+				
+				DWORD attr = GetFileAttributesA(numberedPath);
+				if (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY))
+				{
+					sprintf_s(finalPath, "%s", numberedPath);
+					found = true;
+					break;
+				}
+			}
+			if (!found)
+			{
+				sprintf_s(finalPath, "%s%d.wav", basePath, chosen);
+			}
 		}
-
-		sprintf_s(finalPath, "%s\\%s", chosenFolder, findData.cFileName);
-		FindClose(hFind);
 	}
 
     MiniAudioSound* s = new MiniAudioSound();
@@ -554,8 +547,8 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
             &m_engine,
             finalPath,
             MA_SOUND_FLAG_ASYNC,
-            NULL,
-            NULL,
+            nullptr,
+            nullptr,
             &s->sound) != MA_SUCCESS)
     {
         app.DebugPrintf("Failed to initialize sound from file: %s\n", finalPath);
@@ -564,10 +557,13 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
     }
 
     ma_sound_set_spatialization_enabled(&s->sound, MA_TRUE);
+    ma_sound_set_min_distance(&s->sound, SFX_3D_MIN_DISTANCE);
+    ma_sound_set_max_distance(&s->sound, SFX_3D_MAX_DISTANCE);
+    ma_sound_set_rolloff(&s->sound, SFX_3D_ROLLOFF);
 
-    float finalVolume = volume * m_MasterEffectsVolume;
-    if (finalVolume > 1.0f)
-        finalVolume = 1.0f;
+    float finalVolume = volume * m_MasterEffectsVolume * SFX_VOLUME_MULTIPLIER;
+    if (finalVolume > SFX_MAX_GAIN)
+        finalVolume = SFX_MAX_GAIN;
 
     ma_sound_set_volume(&s->sound, finalVolume);
     ma_sound_set_pitch(&s->sound, pitch);
@@ -638,8 +634,8 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
             &m_engine,
             finalPath,
             MA_SOUND_FLAG_ASYNC,
-            NULL,
-            NULL,
+            nullptr,
+            nullptr,
             &s->sound) != MA_SUCCESS)
     {
         delete s;
@@ -652,6 +648,7 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
     float finalVolume = volume * m_MasterEffectsVolume;
     if (finalVolume > 1.0f)
         finalVolume = 1.0f;
+	printf("UI Sound volume set to %f\nEffects volume: %f\n", finalVolume, m_MasterEffectsVolume);
 
     ma_sound_set_volume(&s->sound, finalVolume);
     ma_sound_set_pitch(&s->sound, pitch);
@@ -706,7 +703,7 @@ void SoundEngine::playStreaming(const wstring& name, float x, float y , float z,
 
 		for(unsigned int i=0;i<MAX_LOCAL_PLAYERS;i++)
 		{
-			if(pMinecraft->localplayers[i]!=NULL)
+			if(pMinecraft->localplayers[i]!=nullptr)
 			{
 				if(pMinecraft->localplayers[i]->dimension==LevelData::DIMENSION_END)
 				{
@@ -800,7 +797,7 @@ int SoundEngine::getMusicID(int iDomain)
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// Before the game has started?
-	if(pMinecraft==NULL)
+	if(pMinecraft==nullptr)
 	{
 		// any track from the overworld
 		return GetRandomishTrack(m_iStream_Overworld_Min,m_iStream_Overworld_Max);
@@ -933,8 +930,8 @@ int SoundEngine::OpenStreamThreadProc(void* lpParameter)
             &soundEngine->m_engine,
             soundEngine->m_szStreamName,
             MA_SOUND_FLAG_STREAM,
-            NULL,
-            NULL,
+            nullptr,
+            nullptr,
             &soundEngine->m_musicStream);
 
     if (result != MA_SUCCESS)
@@ -1192,7 +1189,7 @@ void SoundEngine::playMusicUpdate()
 		if( !m_openStreamThread->isRunning() )
 		{
 			delete m_openStreamThread;
-			m_openStreamThread = NULL;
+			m_openStreamThread = nullptr;
 
 			app.DebugPrintf("OpenStreamThreadProc finished. m_musicStreamActive=%d\n", m_musicStreamActive);
 
@@ -1249,7 +1246,7 @@ void SoundEngine::playMusicUpdate()
 		if( !m_openStreamThread->isRunning() )
 		{
 			delete m_openStreamThread;
-			m_openStreamThread = NULL;
+			m_openStreamThread = nullptr;
 			m_StreamState = eMusicStreamState_Stop;
 		}
 		break;
@@ -1285,14 +1282,14 @@ void SoundEngine::playMusicUpdate()
 		}
 		if(GetIsPlayingStreamingGameMusic())
 		{
-			//if(m_MusicInfo.pCue!=NULL)
+			//if(m_MusicInfo.pCue!=nullptr)
 			{
 				bool playerInEnd = false;
 				bool playerInNether=false;
 				Minecraft *pMinecraft = Minecraft::GetInstance();
 				for(unsigned int i = 0; i < MAX_LOCAL_PLAYERS; ++i)
 				{
-					if(pMinecraft->localplayers[i]!=NULL)
+					if(pMinecraft->localplayers[i]!=nullptr)
 					{
 						if(pMinecraft->localplayers[i]->dimension==LevelData::DIMENSION_END)
 						{
@@ -1423,7 +1420,7 @@ void SoundEngine::playMusicUpdate()
 
 			for(unsigned int i=0;i<MAX_LOCAL_PLAYERS;i++)
 			{
-				if(pMinecraft->localplayers[i]!=NULL)
+				if(pMinecraft->localplayers[i]!=nullptr)
 				{
 					if(pMinecraft->localplayers[i]->dimension==LevelData::DIMENSION_END)
 					{
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h
index 5bd2fe4b..38d70d41 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/SoundEngine.h
@@ -6,6 +6,12 @@ using namespace std;
 
 #include "miniaudio.h"
 
+constexpr float SFX_3D_MIN_DISTANCE = 1.0f;
+constexpr float SFX_3D_MAX_DISTANCE = 16.0f;
+constexpr float SFX_3D_ROLLOFF = 0.5f;
+constexpr float SFX_VOLUME_MULTIPLIER = 1.5f;
+constexpr float SFX_MAX_GAIN = 1.5f;
+
 enum eMUSICFILES
 {
 	eStream_Overworld_Calm1 = 0,
@@ -108,23 +114,23 @@ class SoundEngine : public ConsoleSoundEngine
 	static const int MAX_SAME_SOUNDS_PLAYING = 8; // 4J added
 public:
 	SoundEngine();
-	virtual void destroy();
+    void destroy() override;
 #ifdef _DEBUG
 	void GetSoundName(char *szSoundName,int iSound);
 #endif
-	virtual void play(int iSound, float x, float y, float z, float volume, float pitch);
-	virtual void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true);
-	virtual void playUI(int iSound, float volume, float pitch);
-	virtual void playMusicTick();
-	virtual void updateMusicVolume(float fVal);
-	virtual void updateSystemMusicPlaying(bool isPlaying);
-	virtual void updateSoundEffectVolume(float fVal);
-	virtual void init(Options *);
-	virtual void tick(shared_ptr<Mob> *players, float a);	// 4J - updated to take array of local players rather than single one
-	virtual void add(const wstring& name, File *file);
-	virtual void addMusic(const wstring& name, File *file);
-	virtual void addStreaming(const wstring& name, File *file);
-	virtual char *ConvertSoundPathToName(const wstring& name, bool bConvertSpaces=false);
+    void play(int iSound, float x, float y, float z, float volume, float pitch) override;
+    void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true) override;
+    void playUI(int iSound, float volume, float pitch) override;
+    void playMusicTick() override;
+    void updateMusicVolume(float fVal) override;
+    void updateSystemMusicPlaying(bool isPlaying) override;
+    void updateSoundEffectVolume(float fVal) override;
+    void init(Options *) override;
+    void tick(shared_ptr<Mob> *players, float a) override;	// 4J - updated to take array of local players rather than single one
+    void add(const wstring& name, File *file) override;
+    void addMusic(const wstring& name, File *file) override;
+    void addStreaming(const wstring& name, File *file) override;
+    char *ConvertSoundPathToName(const wstring& name, bool bConvertSpaces=false) override;
 	bool isStreamingWavebankReady();		// 4J Added
 	int getMusicID(int iDomain);
 	int getMusicID(const wstring& name);
@@ -138,7 +144,8 @@ private:
 #ifdef __PS3__
 	int initAudioHardware(int iMinSpeakers);
 #else
-	int initAudioHardware(int iMinSpeakers)	{ return iMinSpeakers;}
+	int initAudioHardware(int iMinSpeakers) override
+    { return iMinSpeakers;}
 #endif
 	
 	int GetRandomishTrack(int iStart,int iEnd);
@@ -151,7 +158,7 @@ private:
 	static char m_szSoundPath[];
 	static char m_szMusicPath[];
 	static char m_szRedistName[];
-	static char *m_szStreamFileA[eStream_Max];
+	static const char *m_szStreamFileA[eStream_Max];
 
 	AUDIO_LISTENER m_ListenerA[MAX_LOCAL_PLAYERS];
 	int m_validListenerCount;
diff --git a/Minecraft.Client/Common/Audio/SoundNames.cpp b/Minecraft.Client/Common/Audio/SoundNames.cpp
index 1ab709b2..ebb7e9ee 100644
--- a/Minecraft.Client/Common/Audio/SoundNames.cpp
+++ b/Minecraft.Client/Common/Audio/SoundNames.cpp
@@ -6,14 +6,14 @@
 
 const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
 {
-	L"mob.chicken",						//	eSoundType_MOB_CHICKEN_AMBIENT	
-	L"mob.chickenhurt",					//	eSoundType_MOB_CHICKEN_HURT
-	L"mob.chickenplop",					//	eSoundType_MOB_CHICKENPLOP
-	L"mob.cow",							//	eSoundType_MOB_COW_AMBIENT
-	L"mob.cowhurt",						//	eSoundType_MOB_COW_HURT
-	L"mob.pig",							//	eSoundType_MOB_PIG_AMBIENT
-	L"mob.pigdeath",					//	eSoundType_MOB_PIG_DEATH
-	L"mob.sheep",						//	eSoundType_MOB_SHEEP_AMBIENT
+	L"mob.chicken.say",						//	eSoundType_MOB_CHICKEN_AMBIENT	
+	L"mob.chicken.hurt",					//	eSoundType_MOB_CHICKEN_HURT
+	L"mob.chicken.plop",					//	eSoundType_MOB_CHICKENPLOP
+	L"mob.cow.say",							//	eSoundType_MOB_COW_AMBIENT
+	L"mob.cow.hurt",						//	eSoundType_MOB_COW_HURT
+	L"mob.pig.say",							//	eSoundType_MOB_PIG_AMBIENT
+	L"mob.pig.death",					//	eSoundType_MOB_PIG_DEATH
+	L"mob.sheep.say",						//	eSoundType_MOB_SHEEP_AMBIENT
 	L"mob.wolf.growl",					//	eSoundType_MOB_WOLF_GROWL
 	L"mob.wolf.whine",					//	eSoundType_MOB_WOLF_WHINE
 	L"mob.wolf.panting",				//	eSoundType_MOB_WOLF_PANTING
@@ -43,15 +43,15 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
 	L"mob.silverfish.step",				//	eSoundType_MOB_SILVERFISH_STEP,
 	L"mob.skeleton",					//	eSoundType_MOB_SKELETON_AMBIENT,
 	L"mob.skeletonhurt",				//	eSoundType_MOB_SKELETON_HURT,
-	L"mob.spider",						//	eSoundType_MOB_SPIDER_AMBIENT,
-	L"mob.spiderdeath",					//	eSoundType_MOB_SPIDER_DEATH,
+	L"mob.spider.say",						//	eSoundType_MOB_SPIDER_AMBIENT,
+	L"mob.spider.death",					//	eSoundType_MOB_SPIDER_DEATH,
 	L"mob.slime",						//	eSoundType_MOB_SLIME,
-	L"mob.slimeattack",					//	eSoundType_MOB_SLIME_ATTACK,
-	L"mob.creeper",						//	eSoundType_MOB_CREEPER_HURT,
-	L"mob.creeperdeath",				//	eSoundType_MOB_CREEPER_DEATH,
-	L"mob.zombie",						//	eSoundType_MOB_ZOMBIE_AMBIENT,
-	L"mob.zombiehurt",					//	eSoundType_MOB_ZOMBIE_HURT,
-	L"mob.zombiedeath",					//	eSoundType_MOB_ZOMBIE_DEATH,
+	L"mob.slime.attack",					//	eSoundType_MOB_SLIME_ATTACK,
+	L"mob.creeper.say",						//	eSoundType_MOB_CREEPER_HURT,
+	L"mob.creeper.death",				//	eSoundType_MOB_CREEPER_DEATH,
+	L"mob.zombie.say",						//	eSoundType_MOB_ZOMBIE_AMBIENT,
+	L"mob.zombie.hurt",					//	eSoundType_MOB_ZOMBIE_HURT,
+	L"mob.zombie.death",					//	eSoundType_MOB_ZOMBIE_DEATH,
 	L"mob.zombie.wood",					//	eSoundType_MOB_ZOMBIE_WOOD,
 	L"mob.zombie.woodbreak",			//	eSoundType_MOB_ZOMBIE_WOOD_BREAK,
 	L"mob.zombie.metal",				//	eSoundType_MOB_ZOMBIE_METAL,
@@ -86,7 +86,7 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
 	L"random.door_close",				//	eSoundType_RANDOM_DOOR_CLOSE,
 	L"ambient.weather.rain",			//	eSoundType_AMBIENT_WEATHER_RAIN,
 	L"ambient.weather.thunder",			//	eSoundType_AMBIENT_WEATHER_THUNDER,
-	L"ambient.cave.cave",				//	eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!!
+	L"ambient.cave",				//	eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!!
 #ifdef _XBOX
 	L"ambient.cave.cave2",				//	eSoundType_CAVE_CAVE2 - removed the two sounds that were at 192k in the first ambient cave event
 #endif
@@ -210,9 +210,9 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
 	L"mob.horse.soft",					//eSoundType_MOB_HORSE_SOFT,
 	L"mob.horse.jump",					//eSoundType_MOB_HORSE_JUMP,
 
-	L"mob.witch.idle",					//eSoundType_MOB_WITCH_IDLE,			<--- missing
-	L"mob.witch.hurt",					//eSoundType_MOB_WITCH_HURT,			<--- missing
-	L"mob.witch.death",					//eSoundType_MOB_WITCH_DEATH,			<--- missing
+	L"mob.witch.ambient",					//eSoundType_MOB_WITCH_IDLE,
+	L"mob.witch.hurt",					//eSoundType_MOB_WITCH_HURT,
+	L"mob.witch.death",					//eSoundType_MOB_WITCH_DEATH,
 
 	L"mob.slime.big",					//eSoundType_MOB_SLIME_BIG,
 	L"mob.slime.small",					//eSoundType_MOB_SLIME_SMALL,
diff --git a/Minecraft.Client/Common/Audio/miniaudio.h b/Minecraft.Client/Common/Audio/miniaudio.h
index 24e676bb..01e27040 100644
--- a/Minecraft.Client/Common/Audio/miniaudio.h
+++ b/Minecraft.Client/Common/Audio/miniaudio.h
@@ -3791,8 +3791,8 @@ extern "C" {
     typedef   signed int            ma_int32;
     typedef unsigned int            ma_uint32;
     #if defined(_MSC_VER) && !defined(__clang__)
-        typedef   signed __int64    ma_int64;
-        typedef unsigned __int64    ma_uint64;
+        typedef   signed long long  ma_int64;
+        typedef unsigned long long  ma_uint64;
     #else
         #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
             #pragma GCC diagnostic push
@@ -11249,7 +11249,7 @@ struct ma_sound
     float* pProcessingCache;            /* Will be null if pDataSource is null. */
     ma_uint32 processingCacheFramesRemaining;
     ma_uint32 processingCacheCap;
-    ma_bool8 ownsDataSource;    
+    ma_bool8 ownsDataSource;
 
     /*
     We're declaring a resource manager data source object here to save us a malloc when loading a
@@ -11596,7 +11596,7 @@ IMPLEMENTATION
 
     #include <sys/time.h>   /* select() (used for ma_sleep()). */
     #include <time.h>       /* For nanosleep() */
-    #include <unistd.h> 
+    #include <unistd.h>
 #endif
 
 /* For fstat(), etc. */
@@ -11729,7 +11729,7 @@ IMPLEMENTATION
         #endif
 
         #if _MSC_VER >= 1600 && (defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 160040219)
-            static MA_INLINE unsigned __int64 ma_xgetbv(int reg)
+            static MA_INLINE unsigned long long ma_xgetbv(int reg)
             {
                 return _xgetbv(reg);
             }
@@ -17622,7 +17622,7 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority
             (void)stackSize;  /* Suppress unused parameter warning. */
         }
         #endif
-        
+
 
         if (scheduler != -1) {
             int priorityMin = sched_get_priority_min(scheduler);
@@ -23061,7 +23061,7 @@ static ma_result ma_context_get_MMDevice__wasapi(ma_context* pContext, ma_device
     CoInitializeResult = ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE);
     {
         hr = ma_CoCreateInstance(pContext, &MA_CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, &MA_IID_IMMDeviceEnumerator, (void**)&pDeviceEnumerator);
-    }    
+    }
     if (CoInitializeResult == S_OK || CoInitializeResult == S_FALSE) { ma_CoUninitialize(pContext); }
 
     if (FAILED(hr)) {   /* <-- This is checking the call above to ma_CoCreateInstance(). */
@@ -29687,7 +29687,7 @@ static ma_result ma_device_start__alsa(ma_device* pDevice)
     }
 
     if (pDevice->type == ma_device_type_playback || pDevice->type == ma_device_type_duplex) {
-        /*        
+        /*
         When data is written to the device we wait for the device to get ready to receive data with poll(). In my testing
         I have observed that poll() can sometimes block forever unless the device is started explicitly with snd_pcm_start()
         or some data is written with snd_pcm_writei().
@@ -35996,7 +35996,7 @@ static ma_result ma_device_init_internal__coreaudio(ma_context* pContext, ma_dev
             #endif
         }
 
-        
+
         status = ((ma_AudioUnitSetProperty_proc)pContext->coreaudio.AudioUnitSetProperty)(pData->audioUnit, kAudioUnitProperty_StreamFormat, formatScope, formatElement, &bestFormat, sizeof(bestFormat));
         if (status != noErr) {
             ((ma_AudioComponentInstanceDispose_proc)pContext->coreaudio.AudioComponentInstanceDispose)(pData->audioUnit);
@@ -39310,7 +39310,7 @@ static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUs
 
     (void)error;
     ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] ERROR CALLBACK: error=%d, AAudioStream_getState()=%d\n", error, ((MA_PFN_AAudioStream_getState)pDevice->pContext->aaudio.AAudioStream_getState)(pStream));
-    
+
     /*
     When we get an error, we'll assume that the stream is in an erroneous state and needs to be restarted. From the documentation,
     we cannot do this from the error callback. Therefore we are going to use an event thread for the AAudio backend to do this
@@ -39322,13 +39322,13 @@ static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUs
     else {
         job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE);
         job.data.device.aaudio.reroute.pDevice = pDevice;
-    
+
         if (pStream == pDevice->aaudio.pStreamCapture) {
             job.data.device.aaudio.reroute.deviceType = ma_device_type_capture;
         } else {
             job.data.device.aaudio.reroute.deviceType = ma_device_type_playback;
         }
-    
+
         result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job);
         if (result != MA_SUCCESS) {
             ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n");
@@ -39925,7 +39925,7 @@ static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type dev
 
     /* We got disconnected! Retry a few times, until we find a connected device! */
     iAttempt = 0;
-    while (iAttempt++ < maxAttempts) {        
+    while (iAttempt++ < maxAttempts) {
         /* Device tearing down? No need to reroute! */
         if (ma_atomic_bool32_get(&pDevice->aaudio.isTearingDown)) {
             result = MA_SUCCESS; /* Caller should continue as normal. */
@@ -40023,7 +40023,7 @@ static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type dev
             break;
         }
     }
-    
+
     return result;
 }
 
@@ -61704,7 +61704,7 @@ static ma_result ma_default_vfs_info(ma_vfs* pVFS, ma_vfs_file file, ma_file_inf
         /* Not implemented. Fall back to seek/tell/seek. */
         ma_int64 cursor;
         ma_int64 sizeInBytes;
-        
+
         result = ma_default_vfs_tell(pVFS, file, &cursor);
         if (result != MA_SUCCESS) {
             return result;
@@ -76937,7 +76937,7 @@ static void ma_engine_node_process_pcm_frames__sound(ma_node* pNode, const float
                 if (pSound->processingCacheFramesRemaining > 0) {
                     MA_MOVE_MEMORY(pSound->pProcessingCache, ma_offset_pcm_frames_ptr_f32(pSound->pProcessingCache, frameCountIn, dataSourceChannels), pSound->processingCacheFramesRemaining * ma_get_bytes_per_frame(ma_format_f32, dataSourceChannels));
                 }
-                
+
                 totalFramesRead += (ma_uint32)frameCountOut;   /* Safe cast. */
 
                 if (result != MA_SUCCESS || ma_sound_at_end(pSound)) {
@@ -78439,7 +78439,7 @@ static ma_result ma_sound_init_from_data_source_internal(ma_engine* pEngine, con
         if (pSound->processingCacheCap == 0) {
             pSound->processingCacheCap = 512;
         }
-        
+
         pSound->pProcessingCache = (float*)ma_calloc(pSound->processingCacheCap * ma_get_bytes_per_frame(ma_format_f32, engineNodeConfig.channelsIn), &pEngine->allocationCallbacks);
         if (pSound->pProcessingCache == NULL) {
             ma_engine_node_uninit(&pSound->engineNode, &pEngine->allocationCallbacks);
diff --git a/Minecraft.Client/Common/Audio/stb_vorbis.h b/Minecraft.Client/Common/Audio/stb_vorbis.h
index 9192b162..0e529413 100644
--- a/Minecraft.Client/Common/Audio/stb_vorbis.h
+++ b/Minecraft.Client/Common/Audio/stb_vorbis.h
@@ -112,8 +112,8 @@ extern "C" {
 // query get_info to find the exact amount required. yes I know
 // this is lame).
 //
-// If you pass in a non-NULL buffer of the type below, allocation
-// will occur from it as described above. Otherwise just pass NULL
+// If you pass in a non-nullptr buffer of the type below, allocation
+// will occur from it as described above. Otherwise just pass nullptr
 // to use malloc()/alloca()
 
 typedef struct
@@ -191,8 +191,8 @@ extern stb_vorbis *stb_vorbis_open_pushdata(
 //    the first N bytes of the file--you're told if it's not enough, see below)
 // on success, returns an stb_vorbis *, does not set error, returns the amount of
 //    data parsed/consumed on this call in *datablock_memory_consumed_in_bytes;
-// on failure, returns NULL on error and sets *error, does not change *datablock_memory_consumed
-// if returns NULL and *error is VORBIS_need_more_data, then the input block was
+// on failure, returns nullptr on error and sets *error, does not change *datablock_memory_consumed
+// if returns nullptr and *error is VORBIS_need_more_data, then the input block was
 //       incomplete and you need to pass in a larger block from the start of the file
 
 extern int stb_vorbis_decode_frame_pushdata(
@@ -219,7 +219,7 @@ extern int stb_vorbis_decode_frame_pushdata(
 // without writing state-machiney code to record a partial detection.
 //
 // The number of channels returned are stored in *channels (which can be
-// NULL--it is always the same as the number of channels reported by
+// nullptr--it is always the same as the number of channels reported by
 // get_info). *output will contain an array of float* buffers, one per
 // channel. In other words, (*output)[0][0] contains the first sample from
 // the first channel, and (*output)[1][0] contains the first sample from
@@ -269,18 +269,18 @@ extern int stb_vorbis_decode_memory(const unsigned char *mem, int len, int *chan
 extern stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len,
                                   int *error, const stb_vorbis_alloc *alloc_buffer);
 // create an ogg vorbis decoder from an ogg vorbis stream in memory (note
-// this must be the entire stream!). on failure, returns NULL and sets *error
+// this must be the entire stream!). on failure, returns nullptr and sets *error
 
 #ifndef STB_VORBIS_NO_STDIO
 extern stb_vorbis * stb_vorbis_open_filename(const char *filename,
                                   int *error, const stb_vorbis_alloc *alloc_buffer);
 // create an ogg vorbis decoder from a filename via fopen(). on failure,
-// returns NULL and sets *error (possibly to VORBIS_file_open_failure).
+// returns nullptr and sets *error (possibly to VORBIS_file_open_failure).
 
 extern stb_vorbis * stb_vorbis_open_file(FILE *f, int close_handle_on_close,
                                   int *error, const stb_vorbis_alloc *alloc_buffer);
 // create an ogg vorbis decoder from an open FILE *, looking for a stream at
-// the _current_ seek point (ftell). on failure, returns NULL and sets *error.
+// the _current_ seek point (ftell). on failure, returns nullptr and sets *error.
 // note that stb_vorbis must "own" this stream; if you seek it in between
 // calls to stb_vorbis, it will become confused. Moreover, if you attempt to
 // perform stb_vorbis_seek_*() operations on this file, it will assume it
@@ -291,7 +291,7 @@ extern stb_vorbis * stb_vorbis_open_file_section(FILE *f, int close_handle_on_cl
                 int *error, const stb_vorbis_alloc *alloc_buffer, unsigned int len);
 // create an ogg vorbis decoder from an open FILE *, looking for a stream at
 // the _current_ seek point (ftell); the stream will be of length 'len' bytes.
-// on failure, returns NULL and sets *error. note that stb_vorbis must "own"
+// on failure, returns nullptr and sets *error. note that stb_vorbis must "own"
 // this stream; if you seek it in between calls to stb_vorbis, it will become
 // confused.
 #endif
@@ -314,7 +314,7 @@ extern float        stb_vorbis_stream_length_in_seconds(stb_vorbis *f);
 
 extern int stb_vorbis_get_frame_float(stb_vorbis *f, int *channels, float ***output);
 // decode the next frame and return the number of samples. the number of
-// channels returned are stored in *channels (which can be NULL--it is always
+// channels returned are stored in *channels (which can be nullptr--it is always
 // the same as the number of channels reported by get_info). *output will
 // contain an array of float* buffers, one per channel. These outputs will
 // be overwritten on the next call to stb_vorbis_get_frame_*.
@@ -588,7 +588,7 @@ enum STBVorbisError
       #include <alloca.h>
    #endif
 #else // STB_VORBIS_NO_CRT
-   #define NULL 0
+   #define nullptr 0
    #define malloc(s)   0
    #define free(s)     ((void) 0)
    #define realloc(s)  0
@@ -949,11 +949,11 @@ static void *setup_malloc(vorb *f, int sz)
    f->setup_memory_required += sz;
    if (f->alloc.alloc_buffer) {
       void *p = (char *) f->alloc.alloc_buffer + f->setup_offset;
-      if (f->setup_offset + sz > f->temp_offset) return NULL;
+      if (f->setup_offset + sz > f->temp_offset) return nullptr;
       f->setup_offset += sz;
       return p;
    }
-   return sz ? malloc(sz) : NULL;
+   return sz ? malloc(sz) : nullptr;
 }
 
 static void setup_free(vorb *f, void *p)
@@ -966,7 +966,7 @@ static void *setup_temp_malloc(vorb *f, int sz)
 {
    sz = (sz+7) & ~7; // round up to nearest 8 for alignment of future allocs.
    if (f->alloc.alloc_buffer) {
-      if (f->temp_offset - sz < f->setup_offset) return NULL;
+      if (f->temp_offset - sz < f->setup_offset) return nullptr;
       f->temp_offset -= sz;
       return (char *) f->alloc.alloc_buffer + f->temp_offset;
    }
@@ -1654,12 +1654,12 @@ static int codebook_decode_scalar_raw(vorb *f, Codebook *c)
    int i;
    prep_huffman(f);
 
-   if (c->codewords == NULL && c->sorted_codewords == NULL)
+   if (c->codewords == nullptr && c->sorted_codewords == nullptr)
       return -1;
 
    // cases to use binary search: sorted_codewords && !c->codewords
    //                             sorted_codewords && c->entries > 8
-   if (c->entries > 8 ? c->sorted_codewords!=NULL : !c->codewords) {
+   if (c->entries > 8 ? c->sorted_codewords!=nullptr : !c->codewords) {
       // binary search
       uint32 code = bit_reverse(f->acc);
       int x=0, n=c->sorted_entries, len;
@@ -2629,7 +2629,7 @@ static void inverse_mdct(float *buffer, int n, vorb *f, int blocktype)
    // @OPTIMIZE: reduce register pressure by using fewer variables?
    int save_point = temp_alloc_save(f);
    float *buf2 = (float *) temp_alloc(f, n2 * sizeof(*buf2));
-   float *u=NULL,*v=NULL;
+   float *u=nullptr,*v=nullptr;
    // twiddle factors
    float *A = f->A[blocktype];
 
@@ -3057,7 +3057,7 @@ static float *get_window(vorb *f, int len)
    len <<= 1;
    if (len == f->blocksize_0) return f->window[0];
    if (len == f->blocksize_1) return f->window[1];
-   return NULL;
+   return nullptr;
 }
 
 #ifndef STB_VORBIS_NO_DEFER_FLOOR
@@ -3306,7 +3306,7 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
          if (map->chan[j].mux == i) {
             if (zero_channel[j]) {
                do_not_decode[ch] = TRUE;
-               residue_buffers[ch] = NULL;
+               residue_buffers[ch] = nullptr;
             } else {
                do_not_decode[ch] = FALSE;
                residue_buffers[ch] = f->channel_buffers[j];
@@ -3351,7 +3351,7 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
       if (really_zero_channel[i]) {
          memset(f->channel_buffers[i], 0, sizeof(*f->channel_buffers[i]) * n2);
       } else {
-         do_floor(f, map, i, n, f->channel_buffers[i], f->finalY[i], NULL);
+         do_floor(f, map, i, n, f->channel_buffers[i], f->finalY[i], nullptr);
       }
    }
 #else
@@ -3464,7 +3464,7 @@ static int vorbis_finish_frame(stb_vorbis *f, int len, int left, int right)
    if (f->previous_length) {
       int i,j, n = f->previous_length;
       float *w = get_window(f, n);
-      if (w == NULL) return 0;
+      if (w == nullptr) return 0;
       for (i=0; i < f->channels; ++i) {
          for (j=0; j < n; ++j)
             f->channel_buffers[i][left+j] =
@@ -3647,24 +3647,24 @@ static int start_decoder(vorb *f)
    //file vendor
    len = get32_packet(f);
    f->vendor = (char*)setup_malloc(f, sizeof(char) * (len+1));
-   if (f->vendor == NULL)                           return error(f, VORBIS_outofmem);
+   if (f->vendor == nullptr)                           return error(f, VORBIS_outofmem);
    for(i=0; i < len; ++i) {
       f->vendor[i] = get8_packet(f);
    }
    f->vendor[len] = (char)'\0';
    //user comments
    f->comment_list_length = get32_packet(f);
-   f->comment_list = NULL;
+   f->comment_list = nullptr;
    if (f->comment_list_length > 0)
    {
       f->comment_list = (char**) setup_malloc(f, sizeof(char*) * (f->comment_list_length));
-      if (f->comment_list == NULL)                  return error(f, VORBIS_outofmem);
+      if (f->comment_list == nullptr)                  return error(f, VORBIS_outofmem);
    }
 
    for(i=0; i < f->comment_list_length; ++i) {
       len = get32_packet(f);
       f->comment_list[i] = (char*)setup_malloc(f, sizeof(char) * (len+1));
-      if (f->comment_list[i] == NULL)               return error(f, VORBIS_outofmem);
+      if (f->comment_list[i] == nullptr)               return error(f, VORBIS_outofmem);
 
       for(j=0; j < len; ++j) {
          f->comment_list[i][j] = get8_packet(f);
@@ -3710,7 +3710,7 @@ static int start_decoder(vorb *f)
 
    f->codebook_count = get_bits(f,8) + 1;
    f->codebooks = (Codebook *) setup_malloc(f, sizeof(*f->codebooks) * f->codebook_count);
-   if (f->codebooks == NULL)                        return error(f, VORBIS_outofmem);
+   if (f->codebooks == nullptr)                        return error(f, VORBIS_outofmem);
    memset(f->codebooks, 0, sizeof(*f->codebooks) * f->codebook_count);
    for (i=0; i < f->codebook_count; ++i) {
       uint32 *values;
@@ -3771,7 +3771,7 @@ static int start_decoder(vorb *f)
             f->setup_temp_memory_required = c->entries;
 
          c->codeword_lengths = (uint8 *) setup_malloc(f, c->entries);
-         if (c->codeword_lengths == NULL) return error(f, VORBIS_outofmem);
+         if (c->codeword_lengths == nullptr) return error(f, VORBIS_outofmem);
          memcpy(c->codeword_lengths, lengths, c->entries);
          setup_temp_free(f, lengths, c->entries); // note this is only safe if there have been no intervening temp mallocs!
          lengths = c->codeword_lengths;
@@ -3791,7 +3791,7 @@ static int start_decoder(vorb *f)
       }
 
       c->sorted_entries = sorted_count;
-      values = NULL;
+      values = nullptr;
 
       CHECK(f);
       if (!c->sparse) {
@@ -3820,11 +3820,11 @@ static int start_decoder(vorb *f)
       if (c->sorted_entries) {
          // allocate an extra slot for sentinels
          c->sorted_codewords = (uint32 *) setup_malloc(f, sizeof(*c->sorted_codewords) * (c->sorted_entries+1));
-         if (c->sorted_codewords == NULL) return error(f, VORBIS_outofmem);
+         if (c->sorted_codewords == nullptr) return error(f, VORBIS_outofmem);
          // allocate an extra slot at the front so that c->sorted_values[-1] is defined
          // so that we can catch that case without an extra if
          c->sorted_values    = ( int   *) setup_malloc(f, sizeof(*c->sorted_values   ) * (c->sorted_entries+1));
-         if (c->sorted_values == NULL) return error(f, VORBIS_outofmem);
+         if (c->sorted_values == nullptr) return error(f, VORBIS_outofmem);
          ++c->sorted_values;
          c->sorted_values[-1] = -1;
          compute_sorted_huffman(c, lengths, values);
@@ -3834,7 +3834,7 @@ static int start_decoder(vorb *f)
          setup_temp_free(f, values, sizeof(*values)*c->sorted_entries);
          setup_temp_free(f, c->codewords, sizeof(*c->codewords)*c->sorted_entries);
          setup_temp_free(f, lengths, c->entries);
-         c->codewords = NULL;
+         c->codewords = nullptr;
       }
 
       compute_accelerated_huffman(c);
@@ -3857,7 +3857,7 @@ static int start_decoder(vorb *f)
          }
          if (c->lookup_values == 0) return error(f, VORBIS_invalid_setup);
          mults = (uint16 *) setup_temp_malloc(f, sizeof(mults[0]) * c->lookup_values);
-         if (mults == NULL) return error(f, VORBIS_outofmem);
+         if (mults == nullptr) return error(f, VORBIS_outofmem);
          for (j=0; j < (int) c->lookup_values; ++j) {
             int q = get_bits(f, c->value_bits);
             if (q == EOP) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_invalid_setup); }
@@ -3874,7 +3874,7 @@ static int start_decoder(vorb *f)
                c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->sorted_entries * c->dimensions);
             } else
                c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->entries        * c->dimensions);
-            if (c->multiplicands == NULL) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); }
+            if (c->multiplicands == nullptr) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); }
             len = sparse ? c->sorted_entries : c->entries;
             for (j=0; j < len; ++j) {
                unsigned int z = sparse ? c->sorted_values[j] : j;
@@ -3902,7 +3902,7 @@ static int start_decoder(vorb *f)
             float last=0;
             CHECK(f);
             c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->lookup_values);
-            if (c->multiplicands == NULL) { setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); }
+            if (c->multiplicands == nullptr) { setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); }
             for (j=0; j < (int) c->lookup_values; ++j) {
                float val = mults[j] * c->delta_value + c->minimum_value + last;
                c->multiplicands[j] = val;
@@ -3931,7 +3931,7 @@ static int start_decoder(vorb *f)
    // Floors
    f->floor_count = get_bits(f, 6)+1;
    f->floor_config = (Floor *)  setup_malloc(f, f->floor_count * sizeof(*f->floor_config));
-   if (f->floor_config == NULL) return error(f, VORBIS_outofmem);
+   if (f->floor_config == nullptr) return error(f, VORBIS_outofmem);
    for (i=0; i < f->floor_count; ++i) {
       f->floor_types[i] = get_bits(f, 16);
       if (f->floor_types[i] > 1) return error(f, VORBIS_invalid_setup);
@@ -4007,7 +4007,7 @@ static int start_decoder(vorb *f)
    // Residue
    f->residue_count = get_bits(f, 6)+1;
    f->residue_config = (Residue *) setup_malloc(f, f->residue_count * sizeof(f->residue_config[0]));
-   if (f->residue_config == NULL) return error(f, VORBIS_outofmem);
+   if (f->residue_config == nullptr) return error(f, VORBIS_outofmem);
    memset(f->residue_config, 0, f->residue_count * sizeof(f->residue_config[0]));
    for (i=0; i < f->residue_count; ++i) {
       uint8 residue_cascade[64];
@@ -4029,7 +4029,7 @@ static int start_decoder(vorb *f)
          residue_cascade[j] = high_bits*8 + low_bits;
       }
       r->residue_books = (short (*)[8]) setup_malloc(f, sizeof(r->residue_books[0]) * r->classifications);
-      if (r->residue_books == NULL) return error(f, VORBIS_outofmem);
+      if (r->residue_books == nullptr) return error(f, VORBIS_outofmem);
       for (j=0; j < r->classifications; ++j) {
          for (k=0; k < 8; ++k) {
             if (residue_cascade[j] & (1 << k)) {
@@ -4049,7 +4049,7 @@ static int start_decoder(vorb *f)
          int classwords = f->codebooks[r->classbook].dimensions;
          int temp = j;
          r->classdata[j] = (uint8 *) setup_malloc(f, sizeof(r->classdata[j][0]) * classwords);
-         if (r->classdata[j] == NULL) return error(f, VORBIS_outofmem);
+         if (r->classdata[j] == nullptr) return error(f, VORBIS_outofmem);
          for (k=classwords-1; k >= 0; --k) {
             r->classdata[j][k] = temp % r->classifications;
             temp /= r->classifications;
@@ -4059,14 +4059,14 @@ static int start_decoder(vorb *f)
 
    f->mapping_count = get_bits(f,6)+1;
    f->mapping = (Mapping *) setup_malloc(f, f->mapping_count * sizeof(*f->mapping));
-   if (f->mapping == NULL) return error(f, VORBIS_outofmem);
+   if (f->mapping == nullptr) return error(f, VORBIS_outofmem);
    memset(f->mapping, 0, f->mapping_count * sizeof(*f->mapping));
    for (i=0; i < f->mapping_count; ++i) {
       Mapping *m = f->mapping + i;
       int mapping_type = get_bits(f,16);
       if (mapping_type != 0) return error(f, VORBIS_invalid_setup);
       m->chan = (MappingChannel *) setup_malloc(f, f->channels * sizeof(*m->chan));
-      if (m->chan == NULL) return error(f, VORBIS_outofmem);
+      if (m->chan == nullptr) return error(f, VORBIS_outofmem);
       if (get_bits(f,1))
          m->submaps = get_bits(f,4)+1;
       else
@@ -4128,11 +4128,11 @@ static int start_decoder(vorb *f)
       f->channel_buffers[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1);
       f->previous_window[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1/2);
       f->finalY[i]          = (int16 *) setup_malloc(f, sizeof(int16) * longest_floorlist);
-      if (f->channel_buffers[i] == NULL || f->previous_window[i] == NULL || f->finalY[i] == NULL) return error(f, VORBIS_outofmem);
+      if (f->channel_buffers[i] == nullptr || f->previous_window[i] == nullptr || f->finalY[i] == nullptr) return error(f, VORBIS_outofmem);
       memset(f->channel_buffers[i], 0, sizeof(float) * f->blocksize_1);
       #ifdef STB_VORBIS_NO_DEFER_FLOOR
       f->floor_buffers[i]   = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1/2);
-      if (f->floor_buffers[i] == NULL) return error(f, VORBIS_outofmem);
+      if (f->floor_buffers[i] == nullptr) return error(f, VORBIS_outofmem);
       #endif
    }
 
@@ -4232,7 +4232,7 @@ static void vorbis_deinit(stb_vorbis *p)
          setup_free(p, c->codewords);
          setup_free(p, c->sorted_codewords);
          // c->sorted_values[-1] is the first entry in the array
-         setup_free(p, c->sorted_values ? c->sorted_values-1 : NULL);
+         setup_free(p, c->sorted_values ? c->sorted_values-1 : nullptr);
       }
       setup_free(p, p->codebooks);
    }
@@ -4266,14 +4266,14 @@ static void vorbis_deinit(stb_vorbis *p)
 
 void stb_vorbis_close(stb_vorbis *p)
 {
-   if (p == NULL) return;
+   if (p == nullptr) return;
    vorbis_deinit(p);
    setup_free(p,p);
 }
 
 static void vorbis_init(stb_vorbis *p, const stb_vorbis_alloc *z)
 {
-   memset(p, 0, sizeof(*p)); // NULL out all malloc'd pointers to start
+   memset(p, 0, sizeof(*p)); // nullptr out all malloc'd pointers to start
    if (z) {
       p->alloc = *z;
       p->alloc.alloc_buffer_length_in_bytes &= ~7;
@@ -4281,12 +4281,12 @@ static void vorbis_init(stb_vorbis *p, const stb_vorbis_alloc *z)
    }
    p->eof = 0;
    p->error = VORBIS__no_error;
-   p->stream = NULL;
-   p->codebooks = NULL;
+   p->stream = nullptr;
+   p->codebooks = nullptr;
    p->page_crc_tests = -1;
    #ifndef STB_VORBIS_NO_STDIO
    p->close_on_free = FALSE;
-   p->f = NULL;
+   p->f = nullptr;
    #endif
 }
 
@@ -4509,7 +4509,7 @@ int stb_vorbis_decode_frame_pushdata(
 
 stb_vorbis *stb_vorbis_open_pushdata(
          const unsigned char *data, int data_len, // the memory available for decoding
-         int *data_used,              // only defined if result is not NULL
+         int *data_used,              // only defined if result is not nullptr
          int *error, const stb_vorbis_alloc *alloc)
 {
    stb_vorbis *f, p;
@@ -4523,7 +4523,7 @@ stb_vorbis *stb_vorbis_open_pushdata(
       else
          *error = p.error;
       vorbis_deinit(&p);
-      return NULL;
+      return nullptr;
    }
    f = vorbis_alloc(&p);
    if (f) {
@@ -4533,7 +4533,7 @@ stb_vorbis *stb_vorbis_open_pushdata(
       return f;
    } else {
       vorbis_deinit(&p);
-      return NULL;
+      return nullptr;
    }
 }
 #endif // STB_VORBIS_NO_PUSHDATA_API
@@ -4680,7 +4680,7 @@ static int go_to_page_before(stb_vorbis *f, unsigned int limit_offset)
 
    set_file_offset(f, previous_safe);
 
-   while (vorbis_find_page(f, &end, NULL)) {
+   while (vorbis_find_page(f, &end, nullptr)) {
       if (end >= limit_offset && stb_vorbis_get_file_offset(f) < limit_offset)
          return 1;
       set_file_offset(f, end);
@@ -4770,7 +4770,7 @@ static int seek_to_sample_coarse(stb_vorbis *f, uint32 sample_number)
             set_file_offset(f, left.page_end + (delta / 2) - 32768);
          }
 
-         if (!vorbis_find_page(f, NULL, NULL)) goto error;
+         if (!vorbis_find_page(f, nullptr, nullptr)) goto error;
       }
 
       for (;;) {
@@ -4920,7 +4920,7 @@ int stb_vorbis_seek(stb_vorbis *f, unsigned int sample_number)
    if (sample_number != f->current_loc) {
       int n;
       uint32 frame_start = f->current_loc;
-      stb_vorbis_get_frame_float(f, &n, NULL);
+      stb_vorbis_get_frame_float(f, &n, nullptr);
       assert(sample_number > frame_start);
       assert(f->channel_buffer_start + (int) (sample_number-frame_start) <= f->channel_buffer_end);
       f->channel_buffer_start += (sample_number - frame_start);
@@ -5063,7 +5063,7 @@ stb_vorbis * stb_vorbis_open_file_section(FILE *file, int close_on_free, int *er
    }
    if (error) *error = p.error;
    vorbis_deinit(&p);
-   return NULL;
+   return nullptr;
 }
 
 stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, const stb_vorbis_alloc *alloc)
@@ -5081,14 +5081,14 @@ stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, const st
    FILE *f;
 #if defined(_WIN32) && defined(__STDC_WANT_SECURE_LIB__)
    if (0 != fopen_s(&f, filename, "rb"))
-      f = NULL;
+      f = nullptr;
 #else
    f = fopen(filename, "rb");
 #endif
    if (f)
       return stb_vorbis_open_file(f, TRUE, error, alloc);
    if (error) *error = VORBIS_file_open_failure;
-   return NULL;
+   return nullptr;
 }
 #endif // STB_VORBIS_NO_STDIO
 
@@ -5097,7 +5097,7 @@ stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *err
    stb_vorbis *f, p;
    if (!data) {
       if (error) *error = VORBIS_unexpected_eof;
-      return NULL;
+      return nullptr;
    }
    vorbis_init(&p, alloc);
    p.stream = (uint8 *) data;
@@ -5116,7 +5116,7 @@ stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *err
    }
    if (error) *error = p.error;
    vorbis_deinit(&p);
-   return NULL;
+   return nullptr;
 }
 
 #ifndef STB_VORBIS_NO_INTEGER_CONVERSION
@@ -5255,8 +5255,8 @@ static void convert_samples_short(int buf_c, short **buffer, int b_offset, int d
 
 int stb_vorbis_get_frame_short(stb_vorbis *f, int num_c, short **buffer, int num_samples)
 {
-   float **output = NULL;
-   int len = stb_vorbis_get_frame_float(f, NULL, &output);
+   float **output = nullptr;
+   int len = stb_vorbis_get_frame_float(f, nullptr, &output);
    if (len > num_samples) len = num_samples;
    if (len)
       convert_samples_short(num_c, buffer, 0, f->channels, output, 0, len);
@@ -5294,7 +5294,7 @@ int stb_vorbis_get_frame_short_interleaved(stb_vorbis *f, int num_c, short *buff
    float **output;
    int len;
    if (num_c == 1) return stb_vorbis_get_frame_short(f,num_c,&buffer, num_shorts);
-   len = stb_vorbis_get_frame_float(f, NULL, &output);
+   len = stb_vorbis_get_frame_float(f, nullptr, &output);
    if (len) {
       if (len*num_c > num_shorts) len = num_shorts / num_c;
       convert_channels_short_interleaved(num_c, buffer, f->channels, output, 0, len);
@@ -5316,7 +5316,7 @@ int stb_vorbis_get_samples_short_interleaved(stb_vorbis *f, int channels, short
       n += k;
       f->channel_buffer_start += k;
       if (n == len) break;
-      if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break;
+      if (!stb_vorbis_get_frame_float(f, nullptr, &outputs)) break;
    }
    return n;
 }
@@ -5333,7 +5333,7 @@ int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, in
       n += k;
       f->channel_buffer_start += k;
       if (n == len) break;
-      if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break;
+      if (!stb_vorbis_get_frame_float(f, nullptr, &outputs)) break;
    }
    return n;
 }
@@ -5343,8 +5343,8 @@ int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_
 {
    int data_len, offset, total, limit, error;
    short *data;
-   stb_vorbis *v = stb_vorbis_open_filename(filename, &error, NULL);
-   if (v == NULL) return -1;
+   stb_vorbis *v = stb_vorbis_open_filename(filename, &error, nullptr);
+   if (v == nullptr) return -1;
    limit = v->channels * 4096;
    *channels = v->channels;
    if (sample_rate)
@@ -5352,7 +5352,7 @@ int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_
    offset = data_len = 0;
    total = limit;
    data = (short *) malloc(total * sizeof(*data));
-   if (data == NULL) {
+   if (data == nullptr) {
       stb_vorbis_close(v);
       return -2;
    }
@@ -5365,7 +5365,7 @@ int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_
          short *data2;
          total *= 2;
          data2 = (short *) realloc(data, total * sizeof(*data));
-         if (data2 == NULL) {
+         if (data2 == nullptr) {
             free(data);
             stb_vorbis_close(v);
             return -2;
@@ -5383,8 +5383,8 @@ int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *samp
 {
    int data_len, offset, total, limit, error;
    short *data;
-   stb_vorbis *v = stb_vorbis_open_memory(mem, len, &error, NULL);
-   if (v == NULL) return -1;
+   stb_vorbis *v = stb_vorbis_open_memory(mem, len, &error, nullptr);
+   if (v == nullptr) return -1;
    limit = v->channels * 4096;
    *channels = v->channels;
    if (sample_rate)
@@ -5392,7 +5392,7 @@ int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *samp
    offset = data_len = 0;
    total = limit;
    data = (short *) malloc(total * sizeof(*data));
-   if (data == NULL) {
+   if (data == nullptr) {
       stb_vorbis_close(v);
       return -2;
    }
@@ -5405,7 +5405,7 @@ int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *samp
          short *data2;
          total *= 2;
          data2 = (short *) realloc(data, total * sizeof(*data));
-         if (data2 == NULL) {
+         if (data2 == nullptr) {
             free(data);
             stb_vorbis_close(v);
             return -2;
@@ -5440,7 +5440,7 @@ int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float
       f->channel_buffer_start += k;
       if (n == len)
          break;
-      if (!stb_vorbis_get_frame_float(f, NULL, &outputs))
+      if (!stb_vorbis_get_frame_float(f, nullptr, &outputs))
          break;
    }
    return n;
@@ -5466,7 +5466,7 @@ int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, in
       f->channel_buffer_start += k;
       if (n == num_samples)
          break;
-      if (!stb_vorbis_get_frame_float(f, NULL, &outputs))
+      if (!stb_vorbis_get_frame_float(f, nullptr, &outputs))
          break;
    }
    return n;
diff --git a/Minecraft.Client/Common/BuildVer.h b/Minecraft.Client/Common/BuildVer.h
index 9248a8eb..eaa77d26 100644
--- a/Minecraft.Client/Common/BuildVer.h
+++ b/Minecraft.Client/Common/BuildVer.h
@@ -1,57 +1,7 @@
-
 #pragma once
 
-
-#define VER_PRODUCTMAJORVERSION     0
-#define VER_PRODUCTMINORVERSION     0
-
-// This goes up with each build
-// 4J-JEV: This value is extracted with a regex so it can be placed as the version in the AppX manifest on Durango.
-#define VER_PRODUCTBUILD            560
-// This goes up if there is any change to network traffic or code in a build
-#define VER_NETWORK		            560
-#define VER_PRODUCTBUILD_QFE        0
-
-#define VER_FILEVERSION_STRING       "1.6"
-#define VER_PRODUCTVERSION_STRING    VER_FILEVERSION_STRING
-#define VER_FILEVERSION_STRING_W     L"1.6"
-#define VER_PRODUCTVERSION_STRING_W  VER_FILEVERSION_STRING_W
-#define VER_FILEBETA_STR         ""
-#undef VER_FILEVERSION
-#define VER_FILEVERSION          VER_PRODUCTMAJORVERSION, VER_PRODUCTMINORVERSION, VER_PRODUCTBUILD, VER_PRODUCTBUILD_QFE
-#define VER_PRODUCTVERSION       VER_PRODUCTMAJORVERSION, VER_PRODUCTMINORVERSION, VER_PRODUCTBUILD, VER_PRODUCTBUILD_QFE
-
-#if     (VER_PRODUCTBUILD < 10)
-#define VER_FILEBPAD    "000"
-#define VER_FILEBPAD_W L"000"
-#elif   (VER_PRODUCTBUILD < 100)
-#define VER_FILEBPAD    "00"
-#define VER_FILEBPAD_W L"00"
-#elif   (VER_PRODUCTBUILD < 1000)
-#define VER_FILEBPAD    "0"
-#define VER_FILEBPAD_W L"0"
-#else
-#define VER_FILEBPAD
-#define VER_FILEBPAD_W
-#endif
-
-#define VER_WIDE_PREFIX(x) L##x
-
-#define VER_FILEVERSION_STR2(x,y)   VER_FILEVERSION_STRING    "." VER_FILEBPAD  #x  "."  #y
-#define VER_FILEVERSION_STR2_W(x,y) VER_FILEVERSION_STRING_W L"." VER_FILEBPAD_W VER_WIDE_PREFIX(#x) L"." VER_WIDE_PREFIX(#y)
-#define VER_FILEVERSION_STR1(x,y)   VER_FILEVERSION_STR2(x, y)
-#define VER_FILEVERSION_STR1_W(x,y) VER_FILEVERSION_STR2_W(x, y)
-
-#undef VER_FILEVERSION_STR
-#define VER_FILEVERSION_STR       VER_FILEVERSION_STR1(VER_PRODUCTBUILD, VER_PRODUCTBUILD_QFE)
-#define VER_PRODUCTVERSION_STR    VER_FILEVERSION_STR1(VER_PRODUCTBUILD, VER_PRODUCTBUILD_QFE)
-
-#define VER_FILEVERSION_STR_W     VER_FILEVERSION_STR1_W(VER_PRODUCTBUILD, VER_PRODUCTBUILD_QFE)
-#define VER_PRODUCTVERSION_STR_W  VER_FILEVERSION_STR1_W(VER_PRODUCTBUILD, VER_PRODUCTBUILD_QFE)
-
-#if     (VER_PRODUCTBUILD_QFE >= 256)
-#error  "QFE number cannot exceed 255"
-#endif
-
-
-
+#define VER_PRODUCTBUILD 560
+#define VER_PRODUCTVERSION_STR_W L"DEV (unknown version)"
+#define VER_FILEVERSION_STR_W VER_PRODUCTVERSION_STR_W
+#define VER_BRANCHVERSION_STR_W L"UNKNOWN BRANCH"
+#define VER_NETWORK VER_PRODUCTBUILD
diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp
index e4bfe732..07326b8c 100644
--- a/Minecraft.Client/Common/Colours/ColourTable.cpp
+++ b/Minecraft.Client/Common/Colours/ColourTable.cpp
@@ -4,7 +4,7 @@
 
 unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;
 
-wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
+const wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
 {
 	L"NOTSET",
 
@@ -325,7 +325,7 @@ void ColourTable::staticCtor()
 {
 	for(unsigned int i = eMinecraftColour_NOT_SET; i < eMinecraftColour_COUNT; ++i)
 	{
-		s_colourNamesMap.insert( unordered_map<wstring,eMinecraftColour>::value_type( ColourTableElements[i], (eMinecraftColour)i) );
+		s_colourNamesMap.insert( unordered_map<wstring,eMinecraftColour>::value_type( ColourTableElements[i], static_cast<eMinecraftColour>(i)) );
 	}
 }
 
@@ -366,7 +366,7 @@ void ColourTable::setColour(const wstring &colourName, int value)
 	auto it = s_colourNamesMap.find(colourName);
 	if(it != s_colourNamesMap.end())
 	{
-		m_colourValues[(int)it->second] = value;
+		m_colourValues[static_cast<int>(it->second)] = value;
 	}
 }
 
@@ -377,5 +377,5 @@ void ColourTable::setColour(const wstring &colourName, const wstring &value)
 
 unsigned int ColourTable::getColour(eMinecraftColour id)
 {
-	return m_colourValues[(int)id];
+	return m_colourValues[static_cast<int>(id)];
 }
diff --git a/Minecraft.Client/Common/Colours/ColourTable.h b/Minecraft.Client/Common/Colours/ColourTable.h
index 8e0a348c..af99a8ed 100644
--- a/Minecraft.Client/Common/Colours/ColourTable.h
+++ b/Minecraft.Client/Common/Colours/ColourTable.h
@@ -5,7 +5,7 @@ class ColourTable
 private:
 	unsigned int m_colourValues[eMinecraftColour_COUNT];
 
-	static wchar_t *ColourTableElements[eMinecraftColour_COUNT];
+	static const wchar_t *ColourTableElements[eMinecraftColour_COUNT];
 	static unordered_map<wstring,eMinecraftColour> s_colourNamesMap;
 
 public:
diff --git a/Minecraft.Client/Common/Console_Utils.cpp b/Minecraft.Client/Common/Console_Utils.cpp
index cb0f1b58..9a64dbea 100644
--- a/Minecraft.Client/Common/Console_Utils.cpp
+++ b/Minecraft.Client/Common/Console_Utils.cpp
@@ -1,21 +1,32 @@
 #include "stdafx.h"
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+#include "..\..\Minecraft.Server\ServerLogManager.h"
+#endif
 
 //--------------------------------------------------------------------------------------
 // Name: DebugSpewV()
 // Desc: Internal helper function
 //--------------------------------------------------------------------------------------
 #ifndef _CONTENT_PACKAGE
-static VOID DebugSpewV( const CHAR* strFormat, const va_list pArgList )
+static VOID DebugSpewV( const CHAR* strFormat, va_list pArgList )
 {
 #if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
-	assert(0);
+    assert(0);
 #else
-	CHAR str[2048];
-	// Use the secure CRT to avoid buffer overruns. Specify a count of
-	// _TRUNCATE so that too long strings will be silently truncated
-	// rather than triggering an error.
-	_vsnprintf_s( str, _TRUNCATE, strFormat, pArgList );
-	OutputDebugStringA( str );
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+    // Dedicated server routes legacy debug spew through ServerLogger to preserve CLI prompt handling.
+    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+    {
+        ServerRuntime::ServerLogManager::ForwardClientDebugSpewLogV(strFormat, pArgList);
+        return;
+    }
+#endif
+    CHAR str[2048];
+    // Use the secure CRT to avoid buffer overruns. Specify a count of
+    // _TRUNCATE so that too long strings will be silently truncated
+    // rather than triggering an error.
+    _vsnprintf_s( str, _TRUNCATE, strFormat, pArgList );
+    OutputDebugStringA( str );
 #endif
 }
 #endif
@@ -31,10 +42,9 @@ VOID CDECL DebugPrintf( const CHAR* strFormat, ... )
 #endif
 {
 #ifndef _CONTENT_PACKAGE
-	va_list pArgList;
-	va_start( pArgList, strFormat );
-	DebugSpewV( strFormat, pArgList );
-	va_end( pArgList );
+    va_list pArgList;
+    va_start( pArgList, strFormat );
+    DebugSpewV( strFormat, pArgList );
+    va_end( pArgList );
 #endif
 }
-
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 3aae68d2..0a2fd159 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -38,6 +38,9 @@
 #include "GameRules\ConsoleSchematicFile.h"
 #include "..\User.h"
 #include "..\..\Minecraft.World\LevelData.h"
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+#include "..\..\Minecraft.Server\ServerLogManager.h"
+#endif
 #include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 #include "..\EntityRenderDispatcher.h"
 #include "..\..\Minecraft.World\compression.h"
@@ -100,7 +103,7 @@ CMinecraftApp::CMinecraftApp()
 	{
 		m_eTMSAction[i]=eTMSAction_Idle;
 		m_eXuiAction[i]=eAppAction_Idle;
-		m_eXuiActionParam[i] = NULL;
+		m_eXuiActionParam[i] = nullptr;
 		//m_dwAdditionalModelParts[i] = 0;
 
 		if(FAILED(XUserGetSigninInfo(i,XUSER_GET_SIGNIN_INFO_OFFLINE_XUID_ONLY ,&m_currentSigninInfo[i])))
@@ -157,9 +160,9 @@ CMinecraftApp::CMinecraftApp()
 	// 	m_bRead_TMS_XUIDS_XML=false;
 	// 	m_bRead_TMS_DLCINFO_XML=false;
 
-	m_pDLCFileBuffer=NULL;
+	m_pDLCFileBuffer=nullptr;
 	m_dwDLCFileSize=0;
-	m_pBannedListFileBuffer=NULL;
+	m_pBannedListFileBuffer=nullptr;
 	m_dwBannedListFileSize=0;
 
 	m_bDefaultCapeInstallAttempted=false;
@@ -207,7 +210,7 @@ CMinecraftApp::CMinecraftApp()
 #ifdef _XBOX
 	//	m_bTransferSavesToXboxOne=false;
 	//	m_uiTransferSlotC=5;
-#endif	
+#endif
 
 #if (defined _CONTENT_PACAKGE) || (defined _XBOX)
 	m_bUseDPadForDebug = false;
@@ -224,7 +227,7 @@ CMinecraftApp::CMinecraftApp()
 
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-		m_vBannedListA[i] = new vector<PBANNEDLISTDATA>;	
+		m_vBannedListA[i] = new vector<PBANNEDLISTDATA>;
 	}
 
 	LocaleAndLanguageInit();
@@ -240,12 +243,21 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
 {
 
 #ifndef _FINAL_BUILD
-	char    buf[1024];
-	va_list ap;
-	va_start(ap, szFormat);
-	vsnprintf(buf, sizeof(buf), szFormat, ap);
-	va_end(ap);
-	OutputDebugStringA(buf);
+    va_list ap;
+    va_start(ap, szFormat);
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+    // Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
+    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+    {
+        ServerRuntime::ServerLogManager::ForwardClientAppDebugLogV(szFormat, ap);
+        va_end(ap);
+        return;
+    }
+#endif
+    char    buf[1024];
+    vsnprintf(buf, sizeof(buf), szFormat, ap);
+    va_end(ap);
+    OutputDebugStringA(buf);
 #endif
 
 }
@@ -253,53 +265,62 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
 void CMinecraftApp::DebugPrintf(int user, const char *szFormat, ...)
 {
 #ifndef _FINAL_BUILD
-	if(user == USER_NONE)
-		return;
-	char    buf[1024];
-	va_list ap;
-	va_start(ap, szFormat);
-	vsnprintf(buf, sizeof(buf), szFormat, ap);
-	va_end(ap);
+    if(user == USER_NONE)
+        return;
+    va_list ap;
+    va_start(ap, szFormat);
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+    // Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
+    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+    {
+        ServerRuntime::ServerLogManager::ForwardClientUserDebugLogV(user, szFormat, ap);
+        va_end(ap);
+        return;
+    }
+#endif
+    char    buf[1024];
+    vsnprintf(buf, sizeof(buf), szFormat, ap);
+    va_end(ap);
 #ifdef __PS3__
-	unsigned int writelen;
-	sys_tty_write(SYS_TTYP_USER1 + ( user - 1 ), buf, strlen(buf), &writelen );
+    unsigned int writelen;
+    sys_tty_write(SYS_TTYP_USER1 + ( user - 1 ), buf, strlen(buf), &writelen );
 #elif defined __PSVITA__
-	switch(user)
-	{
-	case 0:
-		{
-			SceUID tty2 = sceIoOpen("tty2:", SCE_O_WRONLY, 0);
-			if(tty2>=0)
-			{					
-				std::string string1(buf);
-				sceIoWrite(tty2, string1.c_str(), string1.length());
-				sceIoClose(tty2);
-			}
-		}
-		break;
-	case 1:
-		{
-			SceUID tty3 = sceIoOpen("tty3:", SCE_O_WRONLY, 0);
-			if(tty3>=0)
-			{			
-				std::string string1(buf);
-				sceIoWrite(tty3, string1.c_str(), string1.length());
-				sceIoClose(tty3);
-			}
-		}
-		break;
-	default:
-		OutputDebugStringA(buf);
-		break;
-	}
+    switch(user)
+    {
+    case 0:
+        {
+            SceUID tty2 = sceIoOpen("tty2:", SCE_O_WRONLY, 0);
+            if(tty2>=0)
+            {
+                std::string string1(buf);
+                sceIoWrite(tty2, string1.c_str(), string1.length());
+                sceIoClose(tty2);
+            }
+        }
+        break;
+    case 1:
+        {
+            SceUID tty3 = sceIoOpen("tty3:", SCE_O_WRONLY, 0);
+            if(tty3>=0)
+            {
+                std::string string1(buf);
+                sceIoWrite(tty3, string1.c_str(), string1.length());
+                sceIoClose(tty3);
+            }
+        }
+        break;
+    default:
+        OutputDebugStringA(buf);
+        break;
+    }
 #else
-	OutputDebugStringA(buf);
+    OutputDebugStringA(buf);
 #endif
 #ifndef _XBOX
-	if(user == USER_UI)
-	{
-		ui.logDebugString(buf);
-	}
+    if(user == USER_UI)
+    {
+        ui.logDebugString(buf);
+    }
 #endif
 #endif
 }
@@ -331,7 +352,7 @@ void CMinecraftApp::SetAction(int iPad, eXuiAction action, LPVOID param)
 		m_eXuiAction[iPad]=action;
 		m_eXuiActionParam[iPad] = param;
 	}
-}	
+}
 
 bool CMinecraftApp::IsAppPaused()
 {
@@ -367,7 +388,7 @@ void CMinecraftApp::HandleButtonPresses(int iPad)
 
 	// 		// test an update of the profile data
 	// 		void *pData=ProfileManager.GetGameDefinedProfileData(iPad);
-	// 
+	//
 	// 		unsigned char *pchData= (unsigned char *)pData;
 	// 		int iCount=0;
 	// 		for(int i=0;i<GAME_DEFINED_PROFILE_DATA_BYTES;i++)
@@ -456,7 +477,7 @@ bool CMinecraftApp::LoadCrafting3x3Menu(int iPad,shared_ptr<LocalPlayer> player,
 
 	CraftingPanelScreenInput* initData = new CraftingPanelScreenInput();
 	initData->player = player;
-	initData->iContainerType=RECIPE_TYPE_3x3; 
+	initData->iContainerType=RECIPE_TYPE_3x3;
 	initData->iPad = iPad;
 	initData->x = x;
 	initData->y = y;
@@ -589,7 +610,7 @@ bool CMinecraftApp::LoadContainerMenu(int iPad,shared_ptr<Container> inventory,
 	initData->container = container;
 	initData->iPad		= iPad;
 
-	// Load the scene.	
+	// Load the scene.
 	if(app.GetLocalPlayerCount()>1)
 	{
 		initData->bSplitscreen=true;
@@ -763,7 +784,7 @@ bool CMinecraftApp::LoadBeaconMenu(int iPad ,shared_ptr<Inventory> inventory, sh
 #ifdef _WINDOWS64
 static void Win64_GetSettingsPath(char *outPath, DWORD size)
 {
-    GetModuleFileNameA(NULL, outPath, size);
+    GetModuleFileNameA(nullptr, outPath, size);
     char *lastSlash = strrchr(outPath, '\\');
     if (lastSlash) *(lastSlash + 1) = '\0';
     strncat_s(outPath, size, "settings.dat", _TRUNCATE);
@@ -773,7 +794,7 @@ static void Win64_SaveSettings(GAME_SETTINGS *gs)
     if (!gs) return;
     char filePath[MAX_PATH] = {};
     Win64_GetSettingsPath(filePath, MAX_PATH);
-    FILE *f = NULL;
+    FILE *f = nullptr;
     if (fopen_s(&f, filePath, "wb") == 0 && f)
     {
         fwrite(gs, sizeof(GAME_SETTINGS), 1, f);
@@ -785,7 +806,7 @@ static void Win64_LoadSettings(GAME_SETTINGS *gs)
     if (!gs) return;
     char filePath[MAX_PATH] = {};
     Win64_GetSettingsPath(filePath, MAX_PATH);
-    FILE *f = NULL;
+    FILE *f = nullptr;
     if (fopen_s(&f, filePath, "rb") == 0 && f)
     {
         GAME_SETTINGS temp = {};
@@ -803,7 +824,7 @@ void CMinecraftApp::InitGameSettings()
 #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 		GameSettingsA[i]=(GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(i);
 #else
-		GameSettingsA[i]=(GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(i);
+		GameSettingsA[i]=static_cast<GAME_SETTINGS *>(ProfileManager.GetGameDefinedProfileData(i));
 #endif
 		// clear the flag to say the settings have changed
 		GameSettingsA[i]->bSettingsChanged=false;
@@ -835,10 +856,12 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
 {
 	SetGameSettings(iPad,eGameSetting_MusicVolume,DEFAULT_VOLUME_LEVEL);
 	SetGameSettings(iPad,eGameSetting_SoundFXVolume,DEFAULT_VOLUME_LEVEL);
+	SetGameSettings(iPad,eGameSetting_RenderDistance,16);
 	SetGameSettings(iPad,eGameSetting_Gamma,50);
+	SetGameSettings(iPad,eGameSetting_FOV,0);
 
 	// 4J-PB - Don't reset the difficult level if we're in-game
-	if(Minecraft::GetInstance()->level==NULL)
+	if(Minecraft::GetInstance()->level==nullptr)
 	{
 		app.DebugPrintf("SetDefaultOptions - Difficulty = 1\n");
 		SetGameSettings(iPad,eGameSetting_Difficulty,1);
@@ -912,7 +935,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
 
 	// 4J-JEV: We cannot change these in-game, as they could affect localised strings and font.
 	// XB1: Fix for #172947 - Content: Gameplay: While playing in language different form system default one and resetting options to their defaults in active gameplay causes in-game language to change and HUD to disappear
-	if (!app.GetGameStarted()) 
+	if (!app.GetGameStarted())
 	{
 		GameSettingsA[iPad]->ucLanguage = MINECRAFT_LANGUAGE_DEFAULT; // use the system language
 		GameSettingsA[iPad]->ucLocale = MINECRAFT_LANGUAGE_DEFAULT; // use the system locale
@@ -933,7 +956,7 @@ int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C4JStorage::PROFILESETTI
 int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C_4JProfile::PROFILESETTINGS *pSettings, const int iPad)
 #endif
 {
-	CMinecraftApp *pApp=(CMinecraftApp *)pParam;
+	CMinecraftApp *pApp=static_cast<CMinecraftApp *>(pParam);
 
 	// flag the default options to be set
 
@@ -1022,7 +1045,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 	case PROFILE_VERSION_1:
 	case PROFILE_VERSION_2:
 		// need to fill in values for the new profile data. No need to save the profile - that'll happen if they get changed, or if the auto save for the profile kicks in
-		{	
+		{
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			pGameSettings->ucMenuSensitivity=100; //eGameSetting_Sensitivity_InMenu
 			pGameSettings->ucInterfaceOpacity=80; //eGameSetting_Sensitivity_InMenu
@@ -1068,7 +1091,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		break;
 	case PROFILE_VERSION_3:
 
-		{	
+		{
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			pGameSettings->uiBitmaskValues=0L; // reset
 			pGameSettings->uiBitmaskValues|=GAMESETTING_CLOUDS;		//eGameSetting_Clouds - on
@@ -1202,7 +1225,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		break;
 
 	case PROFILE_VERSION_7:
-		{		
+		{
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			// reset the display new message counter
 			pGameSettings->uiBitmaskValues|=GAMESETTING_DISPLAYUPDATEMSG;		//eGameSetting_DisplayUpdateMessage (counter)
@@ -1225,7 +1248,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		break;
 #endif
 	case PROFILE_VERSION_8:
-		{		
+		{
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			// reset the display new message counter
 			pGameSettings->uiBitmaskValues|=GAMESETTING_DISPLAYUPDATEMSG;		//eGameSetting_DisplayUpdateMessage (counter)
@@ -1243,7 +1266,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		break;
 	case PROFILE_VERSION_9:
 		// PS3DEC13
-		{		
+		{
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			pGameSettings->uiBitmaskValues|=GAMESETTING_DISPLAYUPDATEMSG;		//eGameSetting_DisplayUpdateMessage (counter)
 			pGameSettings->uiBitmaskValues&=~GAMESETTING_PS3EULAREAD;		//eGameSetting_PS3_EULA_Read - off
@@ -1254,7 +1277,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		}
 		break;
 	case PROFILE_VERSION_10:
-		{		
+		{
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			pGameSettings->uiBitmaskValues|=GAMESETTING_DISPLAYUPDATEMSG;		//eGameSetting_DisplayUpdateMessage (counter)
 			pGameSettings->ucLanguage = MINECRAFT_LANGUAGE_DEFAULT; // use the system language
@@ -1273,7 +1296,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		}
 		break;
 	default:
-		{	
+		{
 			// This might be from a version during testing of new profile updates
 			app.DebugPrintf("Don't know what to do with this profile version!\n");
 #ifndef _CONTENT_PACKAGE
@@ -1329,7 +1352,9 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
 {
 	ActionGameSettings(iPad,eGameSetting_MusicVolume	);
 	ActionGameSettings(iPad,eGameSetting_SoundFXVolume	);
+	ActionGameSettings(iPad,eGameSetting_RenderDistance	);
 	ActionGameSettings(iPad,eGameSetting_Gamma			);
+	ActionGameSettings(iPad,eGameSetting_FOV			);
 	ActionGameSettings(iPad,eGameSetting_Difficulty		);
 	ActionGameSettings(iPad,eGameSetting_Sensitivity_InGame	);
 	ActionGameSettings(iPad,eGameSetting_ViewBob		);
@@ -1368,28 +1393,45 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_MusicVolume:
 		if(iPad==ProfileManager.GetPrimaryPad())
 		{
-			pMinecraft->options->set(Options::Option::MUSIC,((float)GameSettingsA[iPad]->ucMusicVolume)/100.0f);
+			pMinecraft->options->set(Options::Option::MUSIC,static_cast<float>(GameSettingsA[iPad]->ucMusicVolume)/100.0f);
 		}
 		break;
-	case eGameSetting_SoundFXVolume:
-		if(iPad==ProfileManager.GetPrimaryPad())
-		{
-			pMinecraft->options->set(Options::Option::SOUND,((float)GameSettingsA[iPad]->ucSoundFXVolume)/100.0f);
-		}				
+    case eGameSetting_SoundFXVolume:
+        if (iPad == ProfileManager.GetPrimaryPad())
+        {
+            pMinecraft->options->set(Options::Option::SOUND, static_cast<float>(GameSettingsA[iPad]->ucSoundFXVolume) / 100.0f);
+        }
+		break;
+	case eGameSetting_RenderDistance:
+        if (iPad == ProfileManager.GetPrimaryPad())
+        {
+            int dist = (GameSettingsA[iPad]->uiBitmaskValues >> 16) & 0xFF;
+
+            int level = UIScene_SettingsGraphicsMenu::DistanceToLevel(dist);
+            pMinecraft->options->set(Options::Option::RENDER_DISTANCE, 3 - level);
+        };
 		break;
 	case eGameSetting_Gamma:
 		if(iPad==ProfileManager.GetPrimaryPad())
 		{
 #if defined(_WIN64) || defined(_WINDOWS64)
-			pMinecraft->options->set(Options::Option::GAMMA, ((float)GameSettingsA[iPad]->ucGamma) / 100.0f);
+			pMinecraft->options->set(Options::Option::GAMMA, static_cast<float>(GameSettingsA[iPad]->ucGamma) / 100.0f);
 #else
 			// ucGamma range is 0-100, UpdateGamma is 0 - 32768
 			float fVal=((float)GameSettingsA[iPad]->ucGamma)*327.68f;
 			RenderManager.UpdateGamma((unsigned short)fVal);
 #endif
-		}				
+		}
 
 		break;
+	case eGameSetting_FOV:
+		if(iPad==ProfileManager.GetPrimaryPad())
+		{
+			float fovDeg = 70.0f + (float)GameSettingsA[iPad]->ucFov * 40.0f / 100.0f;
+			pMinecraft->gameRenderer->SetFovVal(fovDeg);
+			pMinecraft->options->set(Options::Option::FOV, (float)GameSettingsA[iPad]->ucFov / 100.0f);
+		}
+		break;
 	case eGameSetting_Difficulty:		
 		if(iPad==ProfileManager.GetPrimaryPad())
 		{
@@ -1400,7 +1442,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 			app.SetGameHostOption(eGameHostOption_Difficulty,pMinecraft->options->difficulty);
 
 			// send this to the other players if we are in-game
-			bool bInGame=pMinecraft->level!=NULL;
+			bool bInGame=pMinecraft->level!=nullptr;
 
 			// Game Host only (and for now we can't change the diff while in game, so this shouldn't happen)
 			if(bInGame && g_NetworkManager.IsHost() && (iPad==ProfileManager.GetPrimaryPad()))
@@ -1417,7 +1459,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_Sensitivity_InGame:
 		// 4J-PB - we don't use the options value
 		// tell the input that we've changed the sensitivity - range of the slider is 0 to 200, default is 100
-		pMinecraft->options->set(Options::Option::SENSITIVITY,((float)GameSettingsA[iPad]->ucSensitivity)/100.0f);
+		pMinecraft->options->set(Options::Option::SENSITIVITY,static_cast<float>(GameSettingsA[iPad]->ucSensitivity)/100.0f);
 		//InputManager.SetJoypadSensitivity(iPad,((float)GameSettingsA[iPad]->ucSensitivity)/100.0f);
 
 		break;
@@ -1464,7 +1506,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 		break;
 	case eGameSetting_GamertagsVisible:
 		{
-			bool bInGame=pMinecraft->level!=NULL;
+			bool bInGame=pMinecraft->level!=nullptr;
 
 			// Game Host only
 			if(bInGame && g_NetworkManager.IsHost() && (iPad==ProfileManager.GetPrimaryPad()))
@@ -1493,7 +1535,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_DisplaySplitscreenGamertags:
 		for( BYTE idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
-			if(pMinecraft->localplayers[idx] != NULL)
+			if(pMinecraft->localplayers[idx] != nullptr)
 			{
 				if(pMinecraft->localplayers[idx]->m_iScreenSection==C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 				{
@@ -1537,19 +1579,17 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_FriendsOfFriends:
 		//nothing to do here
 		break;
-	case eGameSetting_BedrockFog:
-		{	
-			bool bInGame=pMinecraft->level!=NULL;
-
-			// Game Host only
-			if(bInGame && g_NetworkManager.IsHost() && (iPad==ProfileManager.GetPrimaryPad()))
-			{
-				// Update the Game Host setting if you are the host and you are in-game
-				app.SetGameHostOption(eGameHostOption_BedrockFog,GetGameSettings(iPad,eGameSetting_BedrockFog)?1:0);
-				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_BedrockFog);
-			}
-		}
-		break;
+    case eGameSetting_BedrockFog:
+        {
+            bool bInGame = pMinecraft->level != nullptr;
+
+            if (bInGame && g_NetworkManager.IsHost() && (iPad == ProfileManager.GetPrimaryPad()))
+            {
+                app.SetGameHostOption(eGameHostOption_BedrockFog, GetGameSettings(iPad, eGameSetting_BedrockFog) ? 1 : 0);
+                app.SetXuiServerAction(iPad, eXuiServerAction_ServerSettingChanged_BedrockFog);
+            }
+        }
+        break;
 	case eGameSetting_DisplayHUD:
 		//nothing to do here
 		break;
@@ -1596,7 +1636,7 @@ void CMinecraftApp::SetPlayerSkin(int iPad,DWORD dwSkinId)
 
 	TelemetryManager->RecordSkinChanged(iPad, GameSettingsA[iPad]->dwSelectedSkin);
 
-	if(Minecraft::GetInstance()->localplayers[iPad]!=NULL) Minecraft::GetInstance()->localplayers[iPad]->setAndBroadcastCustomSkin(dwSkinId);
+	if(Minecraft::GetInstance()->localplayers[iPad]!=nullptr) Minecraft::GetInstance()->localplayers[iPad]->setAndBroadcastCustomSkin(dwSkinId);
 }
 
 
@@ -1608,8 +1648,8 @@ wstring CMinecraftApp::GetPlayerSkinName(int iPad)
 DWORD CMinecraftApp::GetPlayerSkinId(int iPad)
 {
 	// 4J-PB -check the user has rights to use this skin - they may have had at some point but the entitlement has been removed.
-	DLCPack *Pack=NULL;
-	DLCSkinFile *skinFile=NULL;
+	DLCPack *Pack=nullptr;
+	DLCSkinFile *skinFile=nullptr;
 	DWORD dwSkin=GameSettingsA[iPad]->dwSelectedSkin;
 	wchar_t chars[256];
 
@@ -1618,7 +1658,7 @@ DWORD CMinecraftApp::GetPlayerSkinId(int iPad)
 		// 4J Stu - DLC skins are numbered using decimal rather than hex to make it easier to number manually
 		swprintf(chars, 256, L"dlcskin%08d.png", GET_DLC_SKIN_ID_FROM_BITMASK(dwSkin));
 
-		Pack=app.m_dlcManager.getPackContainingSkin(chars);	
+		Pack=app.m_dlcManager.getPackContainingSkin(chars);
 
 		if(Pack)
 		{
@@ -1664,7 +1704,7 @@ void CMinecraftApp::SetPlayerCape(int iPad,DWORD dwCapeId)
 
 	//SentientManager.RecordSkinChanged(iPad, GameSettingsA[iPad]->dwSelectedSkin);
 
-	if(Minecraft::GetInstance()->localplayers[iPad]!=NULL) Minecraft::GetInstance()->localplayers[iPad]->setAndBroadcastCustomCape(dwCapeId);
+	if(Minecraft::GetInstance()->localplayers[iPad]!=nullptr) Minecraft::GetInstance()->localplayers[iPad]->setAndBroadcastCustomCape(dwCapeId);
 }
 
 wstring CMinecraftApp::GetPlayerCapeName(int iPad)
@@ -1697,7 +1737,7 @@ unsigned char CMinecraftApp::GetPlayerFavoriteSkinsPos(int iPad)
 
 void CMinecraftApp::SetPlayerFavoriteSkinsPos(int iPad, int iPos)
 {
-	GameSettingsA[iPad]->ucCurrentFavoriteSkinPos=(unsigned char)iPos;
+	GameSettingsA[iPad]->ucCurrentFavoriteSkinPos=static_cast<unsigned char>(iPos);
 	GameSettingsA[iPad]->bSettingsChanged = true;
 }
 
@@ -1734,7 +1774,7 @@ void CMinecraftApp::ValidateFavoriteSkins(int iPad)
 		// Also check they haven't reverted to a trial pack
 		DLCPack *pDLCPack=app.m_dlcManager.getPackContainingSkin(chars);
 
-		if(pDLCPack!=NULL)
+		if(pDLCPack!=nullptr)
 		{
 			// 4J-PB - We should let players add the free skins to their favourites as well!
 			//DLCFile *pDLCFile=pDLCPack->getFile(DLCManager::e_DLCType_Skin,chars);
@@ -1742,7 +1782,7 @@ void CMinecraftApp::ValidateFavoriteSkins(int iPad)
 
 			if( pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Skin, L"") || (pSkinFile && pSkinFile->isFree()))
 			{
-				GameSettingsA[iPad]->uiFavoriteSkinA[uiValidSkin++]=GameSettingsA[iPad]->uiFavoriteSkinA[i];			
+				GameSettingsA[iPad]->uiFavoriteSkinA[uiValidSkin++]=GameSettingsA[iPad]->uiFavoriteSkinA[i];
 			}
 		}
 	}
@@ -1774,14 +1814,14 @@ unsigned int CMinecraftApp::GetMashupPackWorlds(int iPad)
 
 void CMinecraftApp::SetMinecraftLanguage(int iPad, unsigned char ucLanguage)
 {
-	GameSettingsA[iPad]->ucLanguage = ucLanguage; 
+	GameSettingsA[iPad]->ucLanguage = ucLanguage;
 	GameSettingsA[iPad]->bSettingsChanged = true;
 }
 
 unsigned char CMinecraftApp::GetMinecraftLanguage(int iPad)
 {
 	// if there are no game settings read yet, return the default language
-	if(GameSettingsA[iPad]==NULL)
+	if(GameSettingsA[iPad]==nullptr)
 	{
 		return 0;
 	}
@@ -1793,14 +1833,14 @@ unsigned char CMinecraftApp::GetMinecraftLanguage(int iPad)
 
 void CMinecraftApp::SetMinecraftLocale(int iPad, unsigned char ucLocale)
 {
-	GameSettingsA[iPad]->ucLocale = ucLocale; 
+	GameSettingsA[iPad]->ucLocale = ucLocale;
 	GameSettingsA[iPad]->bSettingsChanged = true;
 }
 
 unsigned char CMinecraftApp::GetMinecraftLocale(int iPad)
 {
 	// if there are no game settings read yet, return the default language
-	if(GameSettingsA[iPad]==NULL)
+	if(GameSettingsA[iPad]==nullptr)
 	{
 		return 0;
 	}
@@ -1834,10 +1874,21 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			if(iPad==ProfileManager.GetPrimaryPad())
 			{
 				ActionGameSettings(iPad,eVal);
-			}		
+			}
 			GameSettingsA[iPad]->bSettingsChanged=true;
 		}
 		break;
+	case eGameSetting_RenderDistance:
+		{
+			unsigned int val = ucVal & 0xFF;
+
+			GameSettingsA[iPad]->uiBitmaskValues &= ~(0xFF << 16);
+			GameSettingsA[iPad]->uiBitmaskValues |= val << 16;
+			if(iPad == ProfileManager.GetPrimaryPad())
+				ActionGameSettings(iPad,eVal);
+			GameSettingsA[iPad]->bSettingsChanged = true;
+		}
+		break;
 	case eGameSetting_Gamma:
 		if(GameSettingsA[iPad]->ucGamma!=ucVal)
 		{
@@ -1849,6 +1900,17 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			GameSettingsA[iPad]->bSettingsChanged=true;
 		}
 		break;
+	case eGameSetting_FOV:
+		if(GameSettingsA[iPad]->ucFov!=ucVal)
+		{
+			GameSettingsA[iPad]->ucFov=ucVal;
+			if(iPad==ProfileManager.GetPrimaryPad())
+			{
+				ActionGameSettings(iPad,eVal);
+			}
+			GameSettingsA[iPad]->bSettingsChanged=true;
+		}
+		break;
 	case eGameSetting_Difficulty:		
 		if((GameSettingsA[iPad]->usBitmaskValues&0x03)!=(ucVal&0x03))
 		{
@@ -2194,9 +2256,9 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			}
 			ActionGameSettings(iPad,eVal);
 			GameSettingsA[iPad]->bSettingsChanged=true;
-		}		
-		break;	
-	case eGameSetting_UISize: 
+		}
+		break;
+	case eGameSetting_UISize:
 		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_UISIZE)!=((ucVal&0x03)<<11))
 		{
 			GameSettingsA[iPad]->uiBitmaskValues&=~GAMESETTING_UISIZE;
@@ -2208,7 +2270,7 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			GameSettingsA[iPad]->bSettingsChanged=true;
 		}
 		break;
-	case eGameSetting_UISizeSplitscreen: 
+	case eGameSetting_UISizeSplitscreen:
 		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_UISIZE_SPLITSCREEN)!=((ucVal&0x03)<<13))
 		{
 			GameSettingsA[iPad]->uiBitmaskValues&=~GAMESETTING_UISIZE_SPLITSCREEN;
@@ -2233,8 +2295,8 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			}
 			ActionGameSettings(iPad,eVal);
 			GameSettingsA[iPad]->bSettingsChanged=true;
-		}		
-		break;	
+		}
+		break;
 	case eGameSetting_PS3_EULA_Read:
 		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PS3EULAREAD)!=(ucVal&0x01)<<16)
 		{
@@ -2248,8 +2310,8 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			}
 			ActionGameSettings(iPad,eVal);
 			GameSettingsA[iPad]->bSettingsChanged=true;
-		}		
-		break;	
+		}
+		break;
 	case eGameSetting_PSVita_NetworkModeAdhoc:
 		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)!=(ucVal&0x01)<<17)
 		{
@@ -2263,8 +2325,8 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			}
 			ActionGameSettings(iPad,eVal);
 			GameSettingsA[iPad]->bSettingsChanged=true;
-		}		
-		break;	
+		}
+		break;
 
 	}
 }
@@ -2286,9 +2348,19 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_SoundFXVolume:
 		return GameSettingsA[iPad]->ucSoundFXVolume;
 		break;
+	case eGameSetting_RenderDistance:
+		{
+		int val = (GameSettingsA[iPad]->uiBitmaskValues >> 16) & 0xFF;
+		if(val == 0) return val = 16; //brain
+		return val;
+		break;
+		}
 	case eGameSetting_Gamma:
 		return GameSettingsA[iPad]->ucGamma;
 		break;
+	case eGameSetting_FOV:
+		return GameSettingsA[iPad]->ucFov;
+		break;
 	case eGameSetting_Difficulty:		
 		return GameSettingsA[iPad]->usBitmaskValues&0x0003;
 		break;
@@ -2353,7 +2425,7 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
 		break;
 	case eGameSetting_DisplayUpdateMessage:
 		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_DISPLAYUPDATEMSG)>>4;
-		break;	
+		break;
 	case eGameSetting_BedrockFog:
 		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_BEDROCKFOG)>>6;
 		break;
@@ -2470,7 +2542,7 @@ unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlay
 
 	shared_ptr<Player> player = Minecraft::GetInstance()->localplayers[iPad];
 
-	if(bOverridePlayer || player==NULL)
+	if(bOverridePlayer || player==nullptr)
 	{
 		return  GameSettingsA[iPad]->uiDebugBitmask;
 	}
@@ -2644,7 +2716,7 @@ int CMinecraftApp::DisplaySavingMessage(void *pParam, C4JStorage::ESavingMessage
 
 void CMinecraftApp::SetActionConfirmed(LPVOID param)
 {
-	XuiActionParam *actionInfo = (XuiActionParam *)param;
+	XuiActionParam *actionInfo = static_cast<XuiActionParam *>(param);
 	app.SetAction(actionInfo->iPad, actionInfo->action);
 }
 
@@ -2685,13 +2757,13 @@ void CMinecraftApp::HandleXuiActions(void)
 		param = m_eXuiActionParam[i];
 
 		if(eAction!=eAppAction_Idle)
-		{			
+		{
 			switch(eAction)
 			{
 				// the renderer will capture a screenshot
 			case eAppAction_SocialPost:
 				if(ProfileManager.IsFullVersion())
-				{		
+				{
 					// Facebook Share
 					if( CSocialManager::Instance()->IsTitleAllowedToPostImages() && CSocialManager::Instance()->AreAllUsersAllowedToPostImages() )
 					{
@@ -2761,7 +2833,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 				break;
 			case eAppAction_AutosaveSaveGame:
-				{		
+				{
 					// Need to run a check to see if the save exists in order to stop the dialog asking if we want to overwrite it coming up on an autosave
 					bool bSaveExists;
 					StorageManager.DoesSaveExist(&bSaveExists);
@@ -2771,7 +2843,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					{
 
 						// flag the render to capture the screenshot for the save
-						SetAction(i,eAppAction_AutosaveSaveGameCapturedThumbnail);				
+						SetAction(i,eAppAction_AutosaveSaveGameCapturedThumbnail);
 					}
 				}
 
@@ -2782,7 +2854,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				app.SetAutosaveTimerTime();
 				SetAction(i,eAppAction_Idle);
 				// Check that there is a name for the save - if we're saving from the tutorial and this is the first save from the tutorial, we'll not have a name
-				/*if(StorageManager.GetSaveName()==NULL)
+				/*if(StorageManager.GetSaveName()==nullptr)
 				{
 				app.NavigateToScene(i,eUIScene_SaveWorld);
 				}
@@ -2800,7 +2872,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					LoadingInputParams *loadingParams = new LoadingInputParams();
 					loadingParams->func = &UIScene_PauseMenu::SaveWorldThreadProc;
-					loadingParams->lpParam = (LPVOID)false;
+					loadingParams->lpParam = static_cast<LPVOID>(false);
 
 					// 4J-JEV - PS4: Fix for #5708 - [ONLINE] - If the user pulls their network cable out while saving the title will hang.
 					loadingParams->waitForThreadToDelete = true;
@@ -2834,7 +2906,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				break;
 			case eAppAction_AutosaveSaveGameCapturedThumbnail:
 
-				{				
+				{
 					app.SetAutosaveTimerTime();
 					SetAction(i,eAppAction_Idle);
 
@@ -2851,7 +2923,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					ui.ShowOtherPlayersBaseScene(ProfileManager.GetPrimaryPad(), false);
 
 					// This just allows it to be shown
-					if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(false);
+					if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(false);
 
 					//INT saveOrCheckpointId = 0;
 					//bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
@@ -2861,7 +2933,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					LoadingInputParams *loadingParams = new LoadingInputParams();
 					loadingParams->func = &UIScene_PauseMenu::SaveWorldThreadProc;
 
-					loadingParams->lpParam = (LPVOID)true;
+					loadingParams->lpParam = (LPVOID)(true);
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 					completionData->bShowBackground=TRUE;
@@ -2884,7 +2956,7 @@ void CMinecraftApp::HandleXuiActions(void)
 			case eAppAction_ExitPlayer:
 				// a secondary player has chosen to quit
 				{
-					int iPlayerC=g_NetworkManager.GetPlayerCount();				
+					int iPlayerC=g_NetworkManager.GetPlayerCount();
 
 					// Since the player is exiting, let's flush any profile writes for them, and hope we're not breaking TCR 136...
 #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
@@ -2905,7 +2977,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					// not required - it's done within the removeLocalPlayerIdx
 					// 				if(pMinecraft->level->isClientSide)
-					// 				{			
+					// 				{
 					// 					// we need to remove the qnetplayer, or this player won't be able to get back into the game until qnet times out and removes them
 					// 					g_NetworkManager.NotifyPlayerLeaving(g_NetworkManager.GetLocalPlayerByUserIndex(i));
 					// 				}
@@ -2927,7 +2999,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					// send the message
 					for(int idx=0;idx<XUSER_MAX_COUNT;idx++)
 					{
-						if((i!=idx) && (pMinecraft->localplayers[idx]!=NULL))
+						if((i!=idx) && (pMinecraft->localplayers[idx]!=nullptr))
 						{
 							XuiBroadcastMessage( CXuiSceneBase::GetPlayerBaseScene(idx), &xuiMsg );
 						}
@@ -2944,9 +3016,9 @@ void CMinecraftApp::HandleXuiActions(void)
 					if(iPlayerC>2) // one player is about to leave here - they'll be set to idle in the qnet manager player leave
 					{
 						for(int iPlayer=0;iPlayer<XUSER_MAX_COUNT;iPlayer++)
-						{	
+						{
 							if((iPlayer!=i) && pMinecraft->localplayers[iPlayer])
-							{						
+							{
 								if(g_NetworkManager.IsLocalGame())
 								{
 									ProfileManager.SetCurrentGameActivity(iPlayer,CONTEXT_PRESENCE_MULTIPLAYEROFFLINE,false);
@@ -2961,9 +3033,9 @@ void CMinecraftApp::HandleXuiActions(void)
 					else
 					{
 						for(int iPlayer=0;iPlayer<XUSER_MAX_COUNT;iPlayer++)
-						{	
+						{
 							if((iPlayer!=i) && pMinecraft->localplayers[iPlayer])
-							{						
+							{
 								if(g_NetworkManager.IsLocalGame())
 								{
 									ProfileManager.SetCurrentGameActivity(iPlayer,CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE,false);
@@ -2978,7 +3050,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 #ifdef _DURANGO
 					ProfileManager.RemoveGamepadFromGame(i);
-#endif	
+#endif
 
 					SetAction(i,eAppAction_Idle);
 				}
@@ -2991,7 +3063,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					StorageManager.ForceQueuedProfileWrites(i);
 #else
 					ProfileManager.ForceQueuedProfileWrites(i);
-#endif	
+#endif
 					// if there are any tips showing, we need to close them
 
 					pMinecraft->gui->clearMessages(i);
@@ -3009,7 +3081,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					// send the message
 					for(int idx=0;idx<XUSER_MAX_COUNT;idx++)
 					{
-						if((i!=idx) && (pMinecraft->localplayers[idx]!=NULL))
+						if((i!=idx) && (pMinecraft->localplayers[idx]!=nullptr))
 						{
 							XuiBroadcastMessage( CXuiSceneBase::GetPlayerBaseScene(idx), &xuiMsg );
 						}
@@ -3026,9 +3098,9 @@ void CMinecraftApp::HandleXuiActions(void)
 					if(iPlayerC>2) // one player is about to leave here - they'll be set to idle in the qnet manager player leave
 					{
 						for(int iPlayer=0;iPlayer<XUSER_MAX_COUNT;iPlayer++)
-						{	
+						{
 							if((iPlayer!=i) && pMinecraft->localplayers[iPlayer])
-							{						
+							{
 								if(g_NetworkManager.IsLocalGame())
 								{
 									ProfileManager.SetCurrentGameActivity(iPlayer,CONTEXT_PRESENCE_MULTIPLAYEROFFLINE,false);
@@ -3043,9 +3115,9 @@ void CMinecraftApp::HandleXuiActions(void)
 					else
 					{
 						for(int iPlayer=0;iPlayer<XUSER_MAX_COUNT;iPlayer++)
-						{	
+						{
 							if((iPlayer!=i) && pMinecraft->localplayers[iPlayer])
-							{						
+							{
 								if(g_NetworkManager.IsLocalGame())
 								{
 									ProfileManager.SetCurrentGameActivity(iPlayer,CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE,false);
@@ -3100,7 +3172,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				SetAction(i,eAppAction_Idle);
 
 				// If we're already leaving don't exit
-				if (g_NetworkManager.IsLeavingGame()) 
+				if (g_NetworkManager.IsLeavingGame())
 				{
 					break;
 				}
@@ -3131,7 +3203,7 @@ void CMinecraftApp::HandleXuiActions(void)
 						Minecraft::GetInstance()->forceStatsSave(j);
 					}
 				}
-				LeaderboardManager::Instance()->CloseSession(); 
+				LeaderboardManager::Instance()->CloseSession();
 #elif (defined _XBOX)
 				ProfileManager.ForceQueuedProfileWrites();
 #endif
@@ -3151,7 +3223,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 #ifdef _DURANGO
 						ProfileManager.RemoveGamepadFromGame(i);
-#endif	
+#endif
 						SetAction(i,eAppAction_Idle);
 						return;
 					}
@@ -3173,9 +3245,9 @@ void CMinecraftApp::HandleXuiActions(void)
 				if(g_NetworkManager.GetPlayerCount()>1)
 				{
 					for(int j=0;j<XUSER_MAX_COUNT;j++)
-					{	
+					{
 						if(pMinecraft->localplayers[j])
-						{						
+						{
 							if(g_NetworkManager.IsLocalGame())
 							{
 								app.SetRichPresenceContext(j,CONTEXT_GAME_STATE_BLANK);
@@ -3194,7 +3266,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				{
 					app.SetRichPresenceContext(i,CONTEXT_GAME_STATE_BLANK);
 					if(g_NetworkManager.IsLocalGame())
-					{	
+					{
 						ProfileManager.SetCurrentGameActivity(i,CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE,false);
 					}
 					else
@@ -3230,24 +3302,24 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					LoadingInputParams *loadingParams = new LoadingInputParams();
 					loadingParams->func = &UIScene_PauseMenu::ExitWorldThreadProc;
-					loadingParams->lpParam = param;			
+					loadingParams->lpParam = param;
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 					// If param is non-null then this is a forced exit by the server, so make sure the player knows why
 					// 4J Stu - Changed - Don't use the FullScreenProgressScreen for action, use a dialog instead
-					completionData->bRequiresUserAction = FALSE;//(param != NULL) ? TRUE : FALSE;
-					completionData->bShowTips = (param != NULL) ? FALSE : TRUE;
+					completionData->bRequiresUserAction = FALSE;//(param != nullptr) ? TRUE : FALSE;
+					completionData->bShowTips = (param != nullptr) ? FALSE : TRUE;
 					completionData->bShowBackground=TRUE;
 					completionData->bShowLogo=TRUE;
 					completionData->type = e_ProgressCompletion_NavigateToHomeMenu;
 					completionData->iPad = DEFAULT_XUI_MENU_USER;
 					loadingParams->completionData = completionData;
 
-					ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);				
+					ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);
 				}
 				break;
 			case eAppAction_ExitWorldTrial:
-				{	
+				{
 					SetAction(i,eAppAction_Idle);
 
 					pMinecraft->gui->clearMessages();
@@ -3274,7 +3346,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					LoadingInputParams *loadingParams = new LoadingInputParams();
 					loadingParams->func = &UIScene_PauseMenu::ExitWorldThreadProc;
-					loadingParams->lpParam = param;			
+					loadingParams->lpParam = param;
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 					completionData->bShowBackground=TRUE;
@@ -3344,11 +3416,11 @@ void CMinecraftApp::HandleXuiActions(void)
 
 						//app.NavigateToScene(i,eUIScene_FullscreenProgress, loadingParams, true);
 					}
-				}	
+				}
 				break;
 			case eAppAction_WaitForRespawnComplete:
 				player = pMinecraft->localplayers[i];
-				if(player != NULL && player->GetPlayerRespawned())
+				if(player != nullptr && player->GetPlayerRespawned())
 				{
 					SetAction(i,eAppAction_Idle);
 
@@ -3373,7 +3445,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				break;
 			case eAppAction_WaitForDimensionChangeComplete:
 				player = pMinecraft->localplayers[i];
-				if(player != NULL && player->connection && player->connection->isStarted())
+				if(player != nullptr && player->connection && player->connection->isStarted())
 				{
 					SetAction(i,eAppAction_Idle);
 					ui.CloseUIScenes(i);
@@ -3384,8 +3456,8 @@ void CMinecraftApp::HandleXuiActions(void)
 				}
 				break;
 			case eAppAction_PrimaryPlayerSignedOut:
-				{		
-					//SetAction(i,eAppAction_Idle);					
+				{
+					//SetAction(i,eAppAction_Idle);
 
 					// clear the autosavetimer that might be displayed
 					ui.ShowAutosaveCountdownTimer(false);
@@ -3403,10 +3475,10 @@ void CMinecraftApp::HandleXuiActions(void)
 					// 4J-PB - the libs will display the Returned to Title screen
 					// 					UINT uiIDA[1];
 					// 					uiIDA[0]=IDS_CONFIRM_OK;
-					// 
+					//
 					// 					ui.RequestMessageBox(IDS_RETURNEDTOMENU_TITLE, IDS_RETURNEDTOTITLESCREEN_TEXT, uiIDA, 1, i,&CMinecraftApp::PrimaryPlayerSignedOutReturned,this,app.GetStringTable());
 					if( g_NetworkManager.IsInSession() )
-					{	
+					{
 						app.SetAction(i,eAppAction_PrimaryPlayerSignedOutReturned);
 					}
 					else
@@ -3454,7 +3526,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 								if (!gameStarted)
 								{
-									// 1. Exit																	
+									// 1. Exit
 									MinecraftServer::HaltServer();
 
 									// Fix for #12530 - TCR 001 BAS Game Stability: Title will crash if the player disconnects while starting a new world and then opts to play the tutorial once they have been returned to the Main Menu.
@@ -3478,7 +3550,7 @@ void CMinecraftApp::HandleXuiActions(void)
 						}
 						else
 						{
-#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__							
+#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
 							if(UIScene_LoadOrJoinMenu::isSaveTransferRunning())
 							{
 								// the save transfer is still in progress, delay jumping back to the main menu until we've cleaned up
@@ -3547,7 +3619,7 @@ void CMinecraftApp::HandleXuiActions(void)
 						}
 
 						LoadingInputParams *loadingParams = new LoadingInputParams();
-						loadingParams->func = &CMinecraftApp::SignoutExitWorldThreadProc;		
+						loadingParams->func = &CMinecraftApp::SignoutExitWorldThreadProc;
 
 						UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 						completionData->bShowBackground=TRUE;
@@ -3585,7 +3657,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				break;
 
 			case eAppAction_TrialOver:
-				{		
+				{
 					SetAction(i,eAppAction_Idle);
 					UINT uiIDA[2];
 					uiIDA[0]=IDS_UNLOCK_TITLE;
@@ -3597,7 +3669,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 				// INVITES
 			case eAppAction_DashboardTrialJoinFromInvite:
-				{						
+				{
 					TelemetryManager->RecordUpsellPresented(i, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID);
 
 					SetAction(i,eAppAction_Idle);
@@ -3609,7 +3681,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				}
 				break;
 			case eAppAction_ExitAndJoinFromInvite:
-				{					
+				{
 					UINT uiIDA[3];
 
 					SetAction(i,eAppAction_Idle);
@@ -3618,7 +3690,7 @@ void CMinecraftApp::HandleXuiActions(void)
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
 					// Show save option is saves ARE disabled
 					if(ProfileManager.IsFullVersion() && StorageManager.GetSaveDisabled() && i==ProfileManager.GetPrimaryPad() && g_NetworkManager.IsHost() && GetGameStarted() )
-					{			
+					{
 						uiIDA[0]=IDS_CONFIRM_CANCEL;
 						uiIDA[1]=IDS_EXIT_GAME_SAVE;
 						uiIDA[2]=IDS_EXIT_GAME_NO_SAVE;
@@ -3628,7 +3700,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					else
 #else
 					if(ProfileManager.IsFullVersion() && !StorageManager.GetSaveDisabled() && i==ProfileManager.GetPrimaryPad() && g_NetworkManager.IsHost() && GetGameStarted() )
-					{			
+					{
 						uiIDA[0]=IDS_CONFIRM_CANCEL;
 						uiIDA[1]=IDS_EXIT_GAME_SAVE;
 						uiIDA[2]=IDS_EXIT_GAME_NO_SAVE;
@@ -3648,7 +3720,7 @@ void CMinecraftApp::HandleXuiActions(void)
 							ui.RequestErrorMessage(IDS_UNLOCK_TITLE, IDS_UNLOCK_ACCEPT_INVITE, uiIDA, 2, i,&CMinecraftApp::UnlockFullInviteReturned,this);
 						}
 						else
-						{						
+						{
 							uiIDA[0]=IDS_CONFIRM_CANCEL;
 							uiIDA[1]=IDS_CONFIRM_OK;
 							ui.RequestAlertMessage(IDS_EXIT_GAME, IDS_CONFIRM_LEAVE_VIA_INVITE, uiIDA, 2,i,&CMinecraftApp::ExitAndJoinFromInvite,this);
@@ -3687,12 +3759,12 @@ void CMinecraftApp::HandleXuiActions(void)
 					// unload any texture pack audio
 					// if there is audio in use, clear out the audio, and unmount the pack
 					TexturePack *pTexPack=Minecraft::GetInstance()->skins->getSelected();
-					DLCTexturePack *pDLCTexPack=NULL;
+					DLCTexturePack *pDLCTexPack=nullptr;
 
 					if(pTexPack->hasAudio())
 					{
 						// get the dlc texture pack, and store it
-						pDLCTexPack=(DLCTexturePack *)pTexPack;
+						pDLCTexPack=static_cast<DLCTexturePack *>(pTexPack);
 					}
 
 					// change to the default texture pack
@@ -3711,11 +3783,11 @@ void CMinecraftApp::HandleXuiActions(void)
 						pMinecraft->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1);
 
 #ifdef _XBOX
-						if(pDLCTexPack->m_pStreamedWaveBank!=NULL)
+						if(pDLCTexPack->m_pStreamedWaveBank!=nullptr)
 						{
 							pDLCTexPack->m_pStreamedWaveBank->Destroy();
 						}
-						if(pDLCTexPack->m_pSoundBank!=NULL)
+						if(pDLCTexPack->m_pSoundBank!=nullptr)
 						{
 							pDLCTexPack->m_pSoundBank->Destroy();
 						}
@@ -3734,18 +3806,18 @@ void CMinecraftApp::HandleXuiActions(void)
 					for(unsigned int index = 0; index < XUSER_MAX_COUNT; ++index)
 					{
 						if(ProfileManager.IsSignedIn(index) )
-						{
-							if(index==i || pMinecraft->localplayers[index]!=NULL )
-							{	
-								m_InviteData.dwLocalUsersMask |= g_NetworkManager.GetLocalPlayerMask( index );
-							}
+                        {
+                            if (index == i || pMinecraft->localplayers[index] != nullptr)
+                            {
+                                m_InviteData.dwLocalUsersMask |= g_NetworkManager.GetLocalPlayerMask(index);
+                            }
 						}
 					}
 #endif
 
-					LoadingInputParams *loadingParams = new LoadingInputParams();
-					loadingParams->func = &CGameNetworkManager::ExitAndJoinFromInviteThreadProc;
-					loadingParams->lpParam = (LPVOID)&m_InviteData;			
+                    LoadingInputParams *loadingParams = new LoadingInputParams();
+                    loadingParams->func = &CGameNetworkManager::ExitAndJoinFromInviteThreadProc;
+                    loadingParams->lpParam = static_cast<LPVOID>(&m_InviteData);
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 					completionData->bShowBackground=TRUE;
@@ -3768,7 +3840,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					g_NetworkManager.SetLocalGame(false);
 
-					JoinFromInviteData *inviteData = (JoinFromInviteData *)param;
+					JoinFromInviteData *inviteData = static_cast<JoinFromInviteData *>(param);
 					// 4J-PB - clear any previous connection errors
 					Minecraft::GetInstance()->clearConnectionFailed();
 
@@ -3783,7 +3855,7 @@ void CMinecraftApp::HandleXuiActions(void)
 						if( index != inviteData->dwUserIndex && ProfileManager.IsSignedIn(index) )
 						{
 							if( (m_InviteData.dwLocalUsersMask & g_NetworkManager.GetLocalPlayerMask( index ) ) == 0 )
-							{	
+							{
 								ProfileManager.RemoveGamepadFromGame(index);
 							}
 						}
@@ -3824,7 +3896,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 						if( !GetChangingSessionType() && !g_NetworkManager.IsLocalGame() )
 						{
-							SetGameStarted(false);	
+							SetGameStarted(false);
 							SetChangingSessionType(true);
 							SetReallyChangingSessionType(true);
 
@@ -3843,7 +3915,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 							LoadingInputParams *loadingParams = new LoadingInputParams();
 							loadingParams->func = &CGameNetworkManager::ChangeSessionTypeThreadProc;
-							loadingParams->lpParam = NULL;			
+							loadingParams->lpParam = nullptr;
 
 							UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 #ifdef __PS3__
@@ -3865,7 +3937,7 @@ void CMinecraftApp::HandleXuiActions(void)
 							}
 							loadingParams->completionData = completionData;
 
-							ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);							
+							ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);
 						}
 					}
 					else if( g_NetworkManager.IsLeavingGame() )
@@ -3892,9 +3964,9 @@ void CMinecraftApp::HandleXuiActions(void)
 			case eAppAction_SetDefaultOptions:
 				SetAction(i,eAppAction_Idle);
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
-				SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
+				SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);
 #else
-				SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
+                SetDefaultOptions(static_cast<C_4JProfile::PROFILESETTINGS *>(param), i);
 #endif
 
 				// if the profile data has been changed, then force a profile write
@@ -3924,7 +3996,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					LoadingInputParams *loadingParams = new LoadingInputParams();
 					loadingParams->func = &CMinecraftApp::RemoteSaveThreadProc;
-					loadingParams->lpParam = NULL;			
+					loadingParams->lpParam = nullptr;			
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 					completionData->bRequiresUserAction=FALSE;
@@ -3966,7 +4038,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				if(!app.GetGameStarted()) MinecraftServer::HaltServer(true);
 
 				if( g_NetworkManager.IsInSession() )
-				{	
+				{
 					app.SetAction(i,eAppAction_PrimaryPlayerSignedOutReturned);
 				}
 				else
@@ -3983,12 +4055,12 @@ void CMinecraftApp::HandleXuiActions(void)
 					{
 						TelemetryManager->RecordBanLevel(i);
 
-#if defined _XBOX 
-						INetworkPlayer *pHost=g_NetworkManager.GetHostPlayer();					
+#if defined _XBOX
+						INetworkPlayer *pHost=g_NetworkManager.GetHostPlayer();
 						// write the level to the banned level list, and exit the world
 						AddLevelToBannedLevelList(i,((NetworkPlayerXbox *)pHost)->GetUID(),GetUniqueMapName(),true);
 #elif defined _XBOX_ONE
-						INetworkPlayer *pHost=g_NetworkManager.GetHostPlayer();	
+						INetworkPlayer *pHost=g_NetworkManager.GetHostPlayer();
 						AddLevelToBannedLevelList(i,pHost->GetUID(),GetUniqueMapName(),true);
 #endif
 						// primary player would exit the world, secondary would exit the player
@@ -4004,7 +4076,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				}
 				break;
 			case eAppAction_LevelInBanLevelList:
-				{			
+				{
 					UINT uiIDA[2];
 					uiIDA[0]=IDS_BUTTON_REMOVE_FROM_BAN_LIST;
 					uiIDA[1]=IDS_EXIT_GAME;
@@ -4043,7 +4115,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				break;
 
 			case eAppAction_ReloadTexturePack:
-				{			
+				{
 					SetAction(i,eAppAction_Idle);
 					Minecraft *pMinecraft = Minecraft::GetInstance();
 					pMinecraft->textures->reloadAll();
@@ -4051,7 +4123,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					if(!pMinecraft->skins->isUsingDefaultSkin())
 					{
-						TexturePack *pTexturePack = pMinecraft->skins->getSelected();		
+						TexturePack *pTexturePack = pMinecraft->skins->getSelected();
 
 						DLCPack *pDLCPack=pTexturePack->getDLCPack();
 
@@ -4069,7 +4141,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					// 4J-PB  - If the texture pack has audio, we need to switch to this
 					if(pMinecraft->skins->getSelected()->hasAudio())
 					{
-						Minecraft::GetInstance()->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1);				
+						Minecraft::GetInstance()->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1);
 					}
 				}
 				break;
@@ -4078,7 +4150,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				{
 #ifndef _XBOX
 					app.DebugPrintf(
-						"[Consoles_App] eAppAction_ReloadFont, ingame='%s'.\n", 
+						"[Consoles_App] eAppAction_ReloadFont, ingame='%s'.\n",
 						app.GetGameStarted() ? "Yes" : "No" );
 
 					SetAction(i,eAppAction_Idle);
@@ -4129,7 +4201,7 @@ void CMinecraftApp::HandleXuiActions(void)
 		eTMS = app.GetTMSAction(i);
 
 		if(eTMS!=eTMSAction_Idle)
-		{			
+		{
 			switch(eTMS)
 			{
 				// TMS++ actions
@@ -4154,7 +4226,7 @@ void CMinecraftApp::HandleXuiActions(void)
 #endif
 			case eTMSAction_TMSPP_UserFileList:
 				// retrieve the file list first
-#if defined _XBOX 
+#if defined _XBOX
 				SetTMSAction(i,eTMSAction_TMSPP_UserFileList_Waiting);
 				app.TMSPP_RetrieveFileList(i,C4JStorage::eGlobalStorage_TitleUser,"\\",eTMSAction_TMSPP_XUIDSFile);
 #elif defined _XBOX_ONE
@@ -4173,7 +4245,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				SetTMSAction(i,eTMSAction_TMSPP_DLCFile);
 #endif
 
-				break;			
+				break;
 			case eTMSAction_TMSPP_DLCFile:
 #if defined _XBOX || defined _XBOX_ONE
 				SetTMSAction(i,eTMSAction_TMSPP_DLCFile_Waiting);
@@ -4207,7 +4279,7 @@ void CMinecraftApp::HandleXuiActions(void)
 			case eTMSAction_TMSPP_RetrieveFiles_HelpAndOptions:
 			case eTMSAction_TMSPP_RetrieveFiles_DLCMain:
 				// retrieve the file list first
-#if defined _XBOX 
+#if defined _XBOX
 				// pass in the next app action on the call or callback completing
 				SetTMSAction(i,eTMSAction_TMSPP_XUIDSFile_Waiting);
 				app.TMSPP_RetrieveFileList(i,C4JStorage::eGlobalStorage_Title,"\\",eTMSAction_TMSPP_DLCFileOnly);
@@ -4219,11 +4291,11 @@ void CMinecraftApp::HandleXuiActions(void)
 #endif
 				break;
 			case eTMSAction_TMSPP_RetrieveUserFilelist_DLCFileOnly:
-#if defined _XBOX 
+#if defined _XBOX
 				SetTMSAction(i,eTMSAction_TMSPP_UserFileList_Waiting);
 				app.TMSPP_RetrieveFileList(i,C4JStorage::eGlobalStorage_TitleUser,"\\",eTMSAction_TMSPP_XUIDSFile);
 #elif defined _XBOX_ONE
-				//StorageManager.TMSPP_DeleteFile(i,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"TP06.png",NULL,NULL, 0);
+				//StorageManager.TMSPP_DeleteFile(i,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"TP06.png",nullptr,nullptr, 0);
 				SetTMSAction(i,eTMSAction_TMSPP_UserFileList_Waiting);
 				app.TMSPP_RetrieveFileList(i,C4JStorage::eGlobalStorage_TitleUser,eTMSAction_TMSPP_DLCFileOnly);
 #else
@@ -4312,7 +4384,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 int CMinecraftApp::BannedLevelDialogReturned(void *pParam,int iPad,const C4JStorage::EMessageResult result)
 {
-	CMinecraftApp* pApp = (CMinecraftApp*)pParam;
+	CMinecraftApp* pApp = static_cast<CMinecraftApp *>(pParam);
 	//Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -4320,7 +4392,7 @@ int CMinecraftApp::BannedLevelDialogReturned(void *pParam,int iPad,const C4JStor
 #if defined _XBOX || defined _XBOX_ONE
 		INetworkPlayer *pHost = g_NetworkManager.GetHostPlayer();
 		// unban the level
-		if (pHost != NULL)
+		if (pHost != nullptr)
 		{
 #if defined _XBOX
 			pApp->RemoveLevelFromBannedLevelList(iPad,((NetworkPlayerXbox *)pHost)->GetUID(),pApp->GetUniqueMapName());
@@ -4361,7 +4433,7 @@ void CMinecraftApp::loadMediaArchive()
 	mediapath = L"Common\\Media\\MediaPSVita.arc";
 #endif
 
-	if (!mediapath.empty()) 
+	if (!mediapath.empty())
 	{
 		m_mediaArchive = new ArchiveFile( File(mediapath) );
 	}
@@ -4370,10 +4442,10 @@ void CMinecraftApp::loadMediaArchive()
 	HANDLE hFile = CreateFile(	path.c_str(),
 		GENERIC_READ,
 		FILE_SHARE_READ,
-		NULL,
+		nullptr,
 		OPEN_EXISTING,
 		FILE_FLAG_SEQUENTIAL_SCAN,
-		NULL );
+		nullptr );
 
 	if( hFile != INVALID_HANDLE_VALUE )
 	{
@@ -4389,7 +4461,7 @@ void CMinecraftApp::loadMediaArchive()
 			m_fBody,
 			dwFileSize,
 			&m_fSize,
-			NULL	);
+			nullptr	);
 
 		assert( m_fSize == dwFileSize );
 
@@ -4401,7 +4473,7 @@ void CMinecraftApp::loadMediaArchive()
 	{
 		assert( false );
 		// AHHHHHHHHHHHH
-		m_mediaArchive = NULL;
+		m_mediaArchive = nullptr;
 	}
 #endif
 }
@@ -4410,7 +4482,7 @@ void CMinecraftApp::loadStringTable()
 {
 #ifndef _XBOX
 
-	if(m_stringTable!=NULL)
+	if(m_stringTable!=nullptr)
 	{
 		// we need to unload the current string table, this is a reload
 		delete m_stringTable;
@@ -4424,7 +4496,7 @@ void CMinecraftApp::loadStringTable()
 	}
 	else
 	{
-		m_stringTable = NULL;
+		m_stringTable = nullptr;
 		assert(false);
 		// AHHHHHHHHH.
 	}
@@ -4437,12 +4509,12 @@ int CMinecraftApp::PrimaryPlayerSignedOutReturned(void *pParam,int iPad,const C4
 	//Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// if the player is null, we're in the menus
-	//if(Minecraft::GetInstance()->player!=NULL)
+	//if(Minecraft::GetInstance()->player!=nullptr)
 
 	// We always create a session before kicking of any of the game code, so even though we may still be joining/creating a game
 	// at this point we want to handle it differently from just being in a menu
 	if( g_NetworkManager.IsInSession() )
-	{	
+	{
 		app.SetAction(iPad,eAppAction_PrimaryPlayerSignedOutReturned);
 	}
 	else
@@ -4458,10 +4530,10 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// if the player is null, we're in the menus
-	if(Minecraft::GetInstance()->player!=NULL)
-	{	
-		app.SetAction(pMinecraft->player->GetXboxPad(),eAppAction_EthernetDisconnectedReturned);
-	}
+    if (Minecraft::GetInstance()->player != nullptr)
+    {
+        app.SetAction(pMinecraft->player->GetXboxPad(), eAppAction_EthernetDisconnectedReturned);
+    }
 	else
 	{
 		//  4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
@@ -4490,7 +4562,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
 	bool saveStats = false;
 	if (pMinecraft->isClientSide() || g_NetworkManager.IsInSession() )
 	{
-		if(lpParameter != NULL )
+		if(lpParameter != nullptr )
 		{
 			switch( app.GetDisconnectReason() )
 			{
@@ -4522,16 +4594,16 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
 			}
 			pMinecraft->progressRenderer->progressStartNoAbort( exitReasonStringId );
 			// 4J - Force a disconnection, this handles the situation that the server has already disconnected
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect(false);
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect(false);
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect(false);
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect(false);
 		}
 		else
 		{
 			exitReasonStringId = IDS_EXITING_GAME;
 			pMinecraft->progressRenderer->progressStartNoAbort( IDS_EXITING_GAME );
 
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect();
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect();
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect();
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect();
 		}
 
 		// 4J Stu - This only does something if we actually have a server, so don't need to do any other checks
@@ -4546,7 +4618,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
 	}
 	else
 	{
-		if(lpParameter != NULL )
+		if(lpParameter != nullptr )
 		{
 			switch( app.GetDisconnectReason() )
 			{
@@ -4583,11 +4655,11 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
 			pMinecraft->progressRenderer->progressStartNoAbort( exitReasonStringId );
 		}
 	}
-	pMinecraft->setLevel(NULL,exitReasonStringId,nullptr,saveStats,true);
+	pMinecraft->setLevel(nullptr,exitReasonStringId,nullptr,saveStats,true);
 
 	// 4J-JEV: Fix for #106402 - TCR #014 BAS Debug Output:
 	// TU12: Mass Effect Mash-UP: Save file "Default_DisplayName" is created on all storage devices after signing out from a re-launched pre-generated world
-	app.m_gameRules.unloadCurrentGameRules(); // 
+	app.m_gameRules.unloadCurrentGameRules(); //
 
 	MinecraftServer::resetFlags();
 
@@ -4609,7 +4681,7 @@ int CMinecraftApp::UnlockFullInviteReturned(void *pParam,int iPad,C4JStorage::EM
 	// bug 11285 - TCR 001: BAS Game Stability: CRASH - When trying to join a full version game with a trial version, the trial crashes
 	// 4J-PB - we may be in the main menus here, and we don't have a pMinecraft->player
 
-	if(pMinecraft->player==NULL)
+	if(pMinecraft->player==nullptr)
 	{
 		bNoPlayer=true;
 	}
@@ -4621,7 +4693,7 @@ int CMinecraftApp::UnlockFullInviteReturned(void *pParam,int iPad,C4JStorage::EM
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -4666,7 +4738,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::EMes
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -4690,7 +4762,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::EMes
 		}
 #elif defined(__ORBIS__)
 		else
-		{		
+		{
 			// Determine why they're not "signed in live"
 			if (ProfileManager.isSignedInPSN(iPad))
 			{
@@ -4702,7 +4774,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::EMes
 				ui.RequestErrorMessage( IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, iPad);
 			}
 			else
-			{		
+			{
 				// Not signed in to PSN
 				UINT uiIDA[1];
 				uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT;
@@ -4721,7 +4793,7 @@ int CMinecraftApp::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::EMes
 
 int CMinecraftApp::UnlockFullExitReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CMinecraftApp* pApp = (CMinecraftApp*)pParam;
+	CMinecraftApp* pApp = static_cast<CMinecraftApp *>(pParam);
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -4731,7 +4803,7 @@ int CMinecraftApp::UnlockFullExitReturned(void *pParam,int iPad,C4JStorage::EMes
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -4759,7 +4831,7 @@ int CMinecraftApp::UnlockFullExitReturned(void *pParam,int iPad,C4JStorage::EMes
 		}
 #elif defined(__ORBIS__)
 		else
-		{		
+		{
 			// Determine why they're not "signed in live"
 			if (ProfileManager.isSignedInPSN(iPad))
 			{
@@ -4773,7 +4845,7 @@ int CMinecraftApp::UnlockFullExitReturned(void *pParam,int iPad,C4JStorage::EMes
 				pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitWorldTrial);
 			}
 			else
-			{		
+			{
 				// Not signed in to PSN
 				UINT uiIDA[1];
 				uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT;
@@ -4793,7 +4865,7 @@ int CMinecraftApp::UnlockFullExitReturned(void *pParam,int iPad,C4JStorage::EMes
 
 int CMinecraftApp::TrialOverReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CMinecraftApp* pApp = (CMinecraftApp*)pParam;
+	CMinecraftApp* pApp = static_cast<CMinecraftApp *>(pParam);
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -4804,7 +4876,7 @@ int CMinecraftApp::TrialOverReturned(void *pParam,int iPad,C4JStorage::EMessageR
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -4851,14 +4923,14 @@ int CMinecraftApp::TrialOverReturned(void *pParam,int iPad,C4JStorage::EMessageR
 
 void CMinecraftApp::ProfileReadErrorCallback(void *pParam)
 {
-	CMinecraftApp *pApp=(CMinecraftApp *)pParam;
+	CMinecraftApp *pApp=static_cast<CMinecraftApp *>(pParam);
 	int iPrimaryPlayer=ProfileManager.GetPrimaryPad();
 	pApp->SetAction(iPrimaryPlayer, eAppAction_ProfileReadError);
 }
 
 void CMinecraftApp::ClearSignInChangeUsersMask()
 {
-	// 4J-PB - When in the main menu, the user is on pad 0, and any change they make to their profile will be to pad 0 data 
+	// 4J-PB - When in the main menu, the user is on pad 0, and any change they make to their profile will be to pad 0 data
 	// If they then go in as a secondary player to a splitscreen game, their profile will not be read again on pad 1 if they were previously in a splitscreen game
 	// This is because m_uiLastSignInData remembers they were in previously, and doesn't read the profile data for them again
 	// Fix this by resetting the m_uiLastSignInData on pressing play game for secondary users. The Primary user does a read profile on play game anyway
@@ -4883,7 +4955,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 	Minecraft::GetInstance()->user->name = convStringToWstring( ProfileManager.GetGamertag(ProfileManager.GetPrimaryPad()));
 #endif
 
-	CMinecraftApp *pApp=(CMinecraftApp *)pParam;
+	CMinecraftApp *pApp=static_cast<CMinecraftApp *>(pParam);
 	// check if the primary player signed out
 	int iPrimaryPlayer=ProfileManager.GetPrimaryPad();
 
@@ -4948,7 +5020,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 					if(i == iPrimaryPlayer) continue;
 
 					// A guest a signed in or out, out of order which invalidates all the guest players we have in the game
-					if(hasGuestIdChanged && pApp->m_currentSigninInfo[i].dwGuestNumber != 0 && g_NetworkManager.GetLocalPlayerByUserIndex(i)!=NULL)
+					if(hasGuestIdChanged && pApp->m_currentSigninInfo[i].dwGuestNumber != 0 && g_NetworkManager.GetLocalPlayerByUserIndex(i)!=nullptr)
 					{
 						pApp->DebugPrintf("Recommending removal of player at index %d because their guest id changed\n",i);
 						pApp->SetAction(i, eAppAction_ExitPlayer);
@@ -4964,15 +5036,15 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 						bool bPlayerChanged=(uiChangedPlayers&(1<<i))==(1<<i);
 						bool bPlayerSignedIn=((uiSignInData&(1<<i))!=0);
 
-						if( bPlayerChanged && (!bPlayerSignedIn || (bPlayerSignedIn && !ProfileManager.AreXUIDSEqual(pApp->m_currentSigninInfo[i].xuid, info.xuid) ) ))					
+						if( bPlayerChanged && (!bPlayerSignedIn || (bPlayerSignedIn && !ProfileManager.AreXUIDSEqual(pApp->m_currentSigninInfo[i].xuid, info.xuid) ) ))
 						{
 							// 4J-PB - invalidate their banned level list
 							pApp->DebugPrintf("Player at index %d Left - invalidating their banned list\n",i);
 							pApp->InvalidateBannedList(i);
-							
+
 							// 4J-HG: If either the player is in the network manager or in the game, need to exit player
 							// TODO: Do we need to check the network manager?
-							if (g_NetworkManager.GetLocalPlayerByUserIndex(i) != NULL || Minecraft::GetInstance()->localplayers[i] != NULL)
+							if (g_NetworkManager.GetLocalPlayerByUserIndex(i) != nullptr || Minecraft::GetInstance()->localplayers[i] != nullptr)
 							{
 								pApp->DebugPrintf("Player %d signed out\n", i);
 								pApp->SetAction(i, eAppAction_ExitPlayer);
@@ -4983,7 +5055,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 					// check if any of the addition players have signed out of PSN (primary player is handled below)
 					if(!switchToOffline && i != ProfileManager.GetLockedProfile() && !g_NetworkManager.IsLocalGame())
 					{
-						if(g_NetworkManager.GetLocalPlayerByUserIndex(i)!=NULL)
+						if(g_NetworkManager.GetLocalPlayerByUserIndex(i)!=nullptr)
 						{
 							if(ProfileManager.IsSignedInLive(i) == false)
 							{
@@ -5020,7 +5092,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 			// 4J-JEV: Need to kick of loading of profile data for sub-sign in players.
 			for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 			{
-				if( i != iPrimaryPlayer 
+				if( i != iPrimaryPlayer
 					&& ( uiChangedPlayers & (1<<i) )
 					&& ( uiSignInData & (1<<i) )
 					)
@@ -5058,7 +5130,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 
 void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, unsigned int uiParam)
 {
-	CMinecraftApp* pClass = (CMinecraftApp*)pParam;
+	CMinecraftApp* pClass = static_cast<CMinecraftApp *>(pParam);
 
 	// push these on to the notifications to be handled in qnet's dowork
 
@@ -5080,7 +5152,7 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 			for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 			{
 				if(!InputManager.IsPadConnected(i) &&
-					Minecraft::GetInstance()->localplayers[i] != NULL &&
+					Minecraft::GetInstance()->localplayers[i] != nullptr &&
 					!ui.IsPauseMenuDisplayed(i) && !ui.IsSceneInStack(i, eUIScene_EndPoem) )
 				{
 					ui.CloseUIScenes(i);
@@ -5109,7 +5181,7 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 			{
 				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)pTexPack;
 				XCONTENTDEVICEID deviceID = pDLCTexPack->GetDLCDeviceID();
-				if( XContentGetDeviceState( deviceID, NULL ) != ERROR_SUCCESS )
+				if( XContentGetDeviceState( deviceID, nullptr ) != ERROR_SUCCESS )
 				{
 					// Set texture pack flag so that it is now considered as not having audio - this is critical so that the next playStreaming does what it is meant to do,
 					// and also so that we don't try and unmount this again, or play any sounds from it in the future
@@ -5117,11 +5189,11 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 					// need to stop the streaming audio - by playing streaming audio from the default texture pack now
 					Minecraft::GetInstance()->soundEngine->playStreaming(L"", 0, 0, 0, 0, 0);
 
-					if(pDLCTexPack->m_pStreamedWaveBank!=NULL)
+					if(pDLCTexPack->m_pStreamedWaveBank!=nullptr)
 					{
 						pDLCTexPack->m_pStreamedWaveBank->Destroy();
 					}
-					if(pDLCTexPack->m_pSoundBank!=NULL)
+					if(pDLCTexPack->m_pSoundBank!=nullptr)
 					{
 						pDLCTexPack->m_pSoundBank->Destroy();
 					}
@@ -5140,7 +5212,7 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 #ifdef __PS3__
 		SQRNetworkManager_PS3::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
@@ -5157,7 +5229,7 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 #ifdef __PS3__
 		SQRNetworkManager_PS3::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
@@ -5169,7 +5241,7 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,i
 	}
 
 	//4J-PB - we need to exit the trial, or we'll be in the pause menu with ignore input true
-	app.SetAction(iPad,eAppAction_ExitWorldTrial);	
+	app.SetAction(iPad,eAppAction_ExitWorldTrial);
 
 	return 0;
 }
@@ -5212,9 +5284,9 @@ void CMinecraftApp::UpsellReturnedCallback(LPVOID pParam, eUpsellType type, eUps
 		uiIDA[0]=IDS_CONFIRM_OK;
 		ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad());
 		break;
-#endif	
+#endif
 	case eUpsellResponse_Declined:
-	default:		
+	default:
 		senResponse = eSen_UpsellOutcome_Declined;
 		break;
 	};
@@ -5230,7 +5302,7 @@ void CMinecraftApp::UpsellReturnedCallback(LPVOID pParam, eUpsellType type, eUps
 		break;
 	};
 
-	// Always the primary pad that gets an upsell	
+	// Always the primary pad that gets an upsell
 	TelemetryManager->RecordUpsellResponded(ProfileManager.GetPrimaryPad(), eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, senResponse);
 }
 
@@ -5247,7 +5319,7 @@ void CMinecraftApp::SetDebugSequence(const char *pchSeq)
 }
 int CMinecraftApp::DebugInputCallback(LPVOID pParam)
 {
-	CMinecraftApp* pClass = (CMinecraftApp*)pParam;
+	CMinecraftApp* pClass = static_cast<CMinecraftApp *>(pParam);
 	//printf("sequence matched\n");
 	pClass->m_bDebugOptions=!pClass->m_bDebugOptions;
 
@@ -5255,7 +5327,7 @@ int CMinecraftApp::DebugInputCallback(LPVOID pParam)
 	{
 		if(app.DebugSettingsOn())
 		{
-			app.ActionDebugMask(i);		
+			app.ActionDebugMask(i);
 		}
 		else
 		{
@@ -5273,7 +5345,7 @@ int CMinecraftApp::GetLocalPlayerCount(void)
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-		if(pMinecraft != NULL && pMinecraft->localplayers[i] != NULL)
+		if(pMinecraft != nullptr && pMinecraft->localplayers[i] != nullptr)
 		{
 			iPlayerC++;
 		}
@@ -5347,7 +5419,7 @@ void CMinecraftApp::MountNextDLC(int iPad)
 		if(StorageManager.MountInstalledDLC(iPad,m_iTotalDLCInstalled,&CMinecraftApp::DLCMountedCallback,this)!=ERROR_IO_PENDING )
 		{
 			// corrupt DLC
-			app.DebugPrintf("Failed to mount DLC %d for pad %d\n",m_iTotalDLCInstalled,iPad);			
+			app.DebugPrintf("Failed to mount DLC %d for pad %d\n",m_iTotalDLCInstalled,iPad);
 			++m_iTotalDLCInstalled;
 			app.MountNextDLC(iPad);
 		}
@@ -5423,15 +5495,15 @@ int CMinecraftApp::DLCMountedCallback(LPVOID pParam,int iPad,DWORD dwErr,DWORD d
 
 		DLCPack *pack = app.m_dlcManager.getPack( CONTENT_DATA_DISPLAY_NAME(ContentData) );
 
-		if( pack != NULL && pack->IsCorrupt() )
+		if( pack != nullptr && pack->IsCorrupt() )
 		{
 			app.DebugPrintf("Pack '%ls' is corrupt, removing it from the DLC Manager.\n", CONTENT_DATA_DISPLAY_NAME(ContentData));
 
 			app.m_dlcManager.removePack(pack);
-			pack = NULL;
+			pack = nullptr;
 		}
 
-		if(pack == NULL)
+		if(pack == nullptr)
 		{
 			app.DebugPrintf("Pack \"%ls\" is not installed, so adding it\n", CONTENT_DATA_DISPLAY_NAME(ContentData));
 
@@ -5475,16 +5547,16 @@ int CMinecraftApp::DLCMountedCallback(LPVOID pParam,int iPad,DWORD dwErr,DWORD d
 //  void CMinecraftApp::InstallDefaultCape()
 //  {
 // 	 if(!m_bDefaultCapeInstallAttempted)
-// 	 { 
+// 	 {
 // 		 // we only attempt to install the cape once per launch of the game
 // 		 m_bDefaultCapeInstallAttempted=true;
-// 
+//
 // 		 wstring wTemp=L"Default_Cape.png";
 // 		 bool bRes=app.IsFileInMemoryTextures(wTemp);
 // 		 // if the file is not already in the memory textures, then read it from TMS
 // 		 if(!bRes)
-// 		 {	
-// 			 BYTE *pBuffer=NULL;
+//       {
+//           BYTE* pBuffer = nullptr;
 // 			 DWORD dwSize=0;
 // 			 // 4J-PB - out for now for DaveK so he doesn't get the birthday cape
 // #ifdef _CONTENT_PACKAGE
@@ -5493,13 +5565,13 @@ int CMinecraftApp::DLCMountedCallback(LPVOID pParam,int iPad,DWORD dwErr,DWORD d
 // 			 if(eTMSStatus==C4JStorage::ETMSStatus_Idle)
 // 			 {
 // 				 app.AddMemoryTextureFile(wTemp,pBuffer,dwSize);
-// 			 }	 
+// 			 }
 // #endif
 // 		 }
 // 	 }
 //  }
 
-void CMinecraftApp::HandleDLC(DLCPack *pack)	
+void CMinecraftApp::HandleDLC(DLCPack *pack)
 {
 	DWORD dwFilesProcessed = 0;
 #ifndef _XBOX
@@ -5513,7 +5585,7 @@ void CMinecraftApp::HandleDLC(DLCPack *pack)
 	// 4J Stu - I don't know why we handle more than one file here any more, however this doesn't seem to work with the PS4 patches
 	if(dlcFilenames.size() > 0) m_dlcManager.readDLCDataFile(dwFilesProcessed, dlcFilenames[0], pack);
 #else
-	for(int i=0; i<dlcFilenames.size();i++)
+	for(size_t i=0; i<dlcFilenames.size();i++)
 	{
 		m_dlcManager.readDLCDataFile(dwFilesProcessed, dlcFilenames[i], pack);
 	}
@@ -5552,9 +5624,9 @@ void CMinecraftApp::HandleDLC(DLCPack *pack)
 				File texturePCKPath(wsTemp );
 				if(texturePCKPath.exists())
 				{
-					app.DebugPrintf("Found a replacement .pck\n");		
+					app.DebugPrintf("Found a replacement .pck\n");
 					m_dlcManager.readDLCDataFile(dwFilesProcessed, wsTemp,pack);
-				}	
+				}
 				else
 				{
 					m_dlcManager.readDLCDataFile(dwFilesProcessed, szFullFilename,pack);
@@ -5564,7 +5636,7 @@ void CMinecraftApp::HandleDLC(DLCPack *pack)
 
 #endif
 			}
-		} 
+		}
 		while( FindNextFile( hFind, &wfd ) );
 
 		// Close the find handle.
@@ -5577,8 +5649,8 @@ void CMinecraftApp::HandleDLC(DLCPack *pack)
 
 //  int CMinecraftApp::DLCReadCallback(LPVOID pParam,C4JStorage::DLC_FILE_DETAILS *pDLCData)
 //  {
-// 
-// 
+//
+//
 // 	 return 0;
 //  }
 
@@ -5587,20 +5659,20 @@ void CMinecraftApp::HandleDLC(DLCPack *pack)
 // Desc: Initializes the timer variables
 //-------------------------------------------------------------------------------------
 void CMinecraftApp::InitTime()
-{    
+{
 
 	// Get the frequency of the timer
 	LARGE_INTEGER qwTicksPerSec;
 	QueryPerformanceFrequency( &qwTicksPerSec );
-	m_Time.fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
+	m_Time.fSecsPerTick = 1.0f / static_cast<float>(qwTicksPerSec.QuadPart);
 
 	// Save the start time
 	QueryPerformanceCounter( &m_Time.qwTime );
 
 	// Zero out the elapsed and total time
 	m_Time.qwAppTime.QuadPart = 0;
-	m_Time.fAppTime = 0.0f; 
-	m_Time.fElapsedTime = 0.0f;    
+	m_Time.fAppTime = 0.0f;
+	m_Time.fElapsedTime = 0.0f;
 }
 
 //-------------------------------------------------------------------------------------
@@ -5612,22 +5684,16 @@ void CMinecraftApp::UpdateTime()
 	LARGE_INTEGER qwNewTime;
 	LARGE_INTEGER qwDeltaTime;
 
-	QueryPerformanceCounter( &qwNewTime );    
+	QueryPerformanceCounter( &qwNewTime );
 	qwDeltaTime.QuadPart = qwNewTime.QuadPart - m_Time.qwTime.QuadPart;
 
-	m_Time.qwAppTime.QuadPart += qwDeltaTime.QuadPart;    
+	m_Time.qwAppTime.QuadPart += qwDeltaTime.QuadPart;
 	m_Time.qwTime.QuadPart     = qwNewTime.QuadPart;
 
-	m_Time.fElapsedTime      = m_Time.fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
-	m_Time.fAppTime          = m_Time.fSecsPerTick * ((FLOAT)(m_Time.qwAppTime.QuadPart));    
+    m_Time.fElapsedTime = m_Time.fSecsPerTick * static_cast<FLOAT>(qwDeltaTime.QuadPart);
+    m_Time.fAppTime = m_Time.fSecsPerTick * static_cast<FLOAT>(m_Time.qwAppTime.QuadPart);
 }
 
-
-
-
-
-
-
 bool CMinecraftApp::isXuidNotch(PlayerUID xuid)
 {
 	if(m_xuidNotch != INVALID_XUID && xuid != INVALID_XUID)
@@ -5652,11 +5718,11 @@ bool CMinecraftApp::isXuidDeadmau5(PlayerUID xuid)
 	return false;
 }
 
-void CMinecraftApp::AddMemoryTextureFile(const wstring &wName,PBYTE pbData,DWORD dwBytes)	
-{	
+void CMinecraftApp::AddMemoryTextureFile(const wstring &wName,PBYTE pbData,DWORD dwBytes)
+{
 	EnterCriticalSection(&csMemFilesLock);
 	// check it's not already in
-	PMEMDATA pData=NULL;
+	PMEMDATA pData=nullptr;
 	auto it = m_MEM_Files.find(wName);
 	if(it != m_MEM_Files.end())
 	{
@@ -5667,8 +5733,8 @@ void CMinecraftApp::AddMemoryTextureFile(const wstring &wName,PBYTE pbData,DWORD
 
 		if(pData->dwBytes == 0 && dwBytes != 0)
 		{
-			// This should never be NULL if dwBytes is 0
-			if(pData->pbData!=NULL) delete [] pData->pbData;
+			// This should never be nullptr if dwBytes is 0
+			if(pData->pbData!=nullptr) delete [] pData->pbData;
 
 			pData->pbData=pbData;
 			pData->dwBytes=dwBytes;
@@ -5729,7 +5795,7 @@ bool CMinecraftApp::DefaultCapeExists()
 
 	EnterCriticalSection(&csMemFilesLock);
 	auto it = m_MEM_Files.find(wTex);
-	if(it != m_MEM_Files.end()) val = true;	
+	if(it != m_MEM_Files.end()) val = true;
 	LeaveCriticalSection(&csMemFilesLock);
 
 	return val;
@@ -5741,7 +5807,7 @@ bool CMinecraftApp::IsFileInMemoryTextures(const wstring &wName)
 
 	EnterCriticalSection(&csMemFilesLock);
 	auto it = m_MEM_Files.find(wName);
-	if(it != m_MEM_Files.end()) val = true;	
+	if(it != m_MEM_Files.end()) val = true;
 	LeaveCriticalSection(&csMemFilesLock);
 
 	return val;
@@ -5760,14 +5826,14 @@ void CMinecraftApp::GetMemFileDetails(const wstring &wName,PBYTE *ppbData,DWORD
 	LeaveCriticalSection(&csMemFilesLock);
 }
 
-void CMinecraftApp::AddMemoryTPDFile(int iConfig,PBYTE pbData,DWORD dwBytes)	
-{	
+void CMinecraftApp::AddMemoryTPDFile(int iConfig,PBYTE pbData,DWORD dwBytes)
+{
 	EnterCriticalSection(&csMemTPDLock);
 	// check it's not already in
-	PMEMDATA pData=NULL;
+	PMEMDATA pData=nullptr;
 	auto it = m_MEM_TPD.find(iConfig);
 	if(it == m_MEM_TPD.end())
-	{	
+	{
 		pData = (PMEMDATA)new BYTE[sizeof(MEMDATA)];
 		ZeroMemory( pData, sizeof(MEMDATA) );
 		pData->pbData=pbData;
@@ -5780,11 +5846,11 @@ void CMinecraftApp::AddMemoryTPDFile(int iConfig,PBYTE pbData,DWORD dwBytes)
 	LeaveCriticalSection(&csMemTPDLock);
 }
 
-void CMinecraftApp::RemoveMemoryTPDFile(int iConfig)	
-{	
+void CMinecraftApp::RemoveMemoryTPDFile(int iConfig)
+{
 	EnterCriticalSection(&csMemTPDLock);
 	// check it's not already in
-	PMEMDATA pData=NULL;
+	PMEMDATA pData=nullptr;
 	auto it = m_MEM_TPD.find(iConfig);
 	if(it != m_MEM_TPD.end())
 	{
@@ -5799,7 +5865,7 @@ void CMinecraftApp::RemoveMemoryTPDFile(int iConfig)
 #ifdef _XBOX
 int CMinecraftApp::GetTPConfigVal(WCHAR *pwchDataFile)
 {
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 	// run through the DLC info to find the right texture pack/mash-up pack
 	for(unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i)
 	{
@@ -5817,7 +5883,7 @@ int CMinecraftApp::GetTPConfigVal(WCHAR *pwchDataFile)
 #elif defined _XBOX_ONE
 int CMinecraftApp::GetTPConfigVal(WCHAR *pwchDataFile)
 {
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 	// run through the DLC info to find the right texture pack/mash-up pack
 	for(unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i)
 	{
@@ -5843,7 +5909,7 @@ bool CMinecraftApp::IsFileInTPD(int iConfig)
 
 	EnterCriticalSection(&csMemTPDLock);
 	auto it = m_MEM_TPD.find(iConfig);
-	if(it != m_MEM_TPD.end()) val = true;	
+	if(it != m_MEM_TPD.end()) val = true;
 	LeaveCriticalSection(&csMemTPDLock);
 
 	return val;
@@ -5869,18 +5935,18 @@ void CMinecraftApp::GetTPD(int iConfig,PBYTE *ppbData,DWORD *pdwBytes)
 // #ifndef _CONTENT_PACKAGE
 // 	// read the local file
 // 	File gtsFile( wsFile->c_str() );
-// 
-// 	__int64 fileSize = gtsFile.length();
-// 
+//
+// 	int64_t fileSize = gtsFile.length();
+//
 // 	if(fileSize!=0)
 // 	{
 // 		FileInputStream fis(gtsFile);
 // 		byteArray ba((int)fileSize);
 // 		fis.read(ba);
 // 		fis.close();
-// 
+//
 // 		bRes=StorageManager.WriteTMSFile(iQuadrant,eStorageFacility,(WCHAR *)wsFile->c_str(),ba.data, ba.length);
-// 
+//
 // 	}
 // #endif
 // 	return bRes;
@@ -5913,7 +5979,7 @@ void CMinecraftApp::ProcessInvite(DWORD dwUserIndex, DWORD dwLocalUsersMask, con
 
 int CMinecraftApp::ExitAndJoinFromInvite(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CMinecraftApp* pApp = (CMinecraftApp*)pParam;
+	CMinecraftApp* pApp = static_cast<CMinecraftApp *>(pParam);
 	//Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// buttons are swapped on this menu
@@ -5927,10 +5993,10 @@ int CMinecraftApp::ExitAndJoinFromInvite(void *pParam,int iPad,C4JStorage::EMess
 
 int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CMinecraftApp *pClass = (CMinecraftApp *)pParam;
+	CMinecraftApp *pClass = static_cast<CMinecraftApp *>(pParam);
 	// Exit with or without saving
 	// Decline means save in this dialog
-	if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultThirdOption) 
+	if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultThirdOption)
 	{
 		if( result==C4JStorage::EMessage_ResultDecline ) // Save
 		{
@@ -5942,7 +6008,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned(void *pParam,int iPad
 
 				DLCPack * pDLCPack=tPack->getDLCPack();
 				if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
-				{					
+				{
 					// upsell
 					// get the dlc texture pack
 
@@ -5962,7 +6028,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned(void *pParam,int iPad
 					// Give the player a warning about the trial version of the texture pack
 					ui.RequestErrorMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad,&CMinecraftApp::WarningTrialTexturePackReturned,pClass);
 
-					return S_OK;					
+					return S_OK;
 				}
 			}
 #ifndef _XBOX_ONE
@@ -6018,7 +6084,7 @@ int CMinecraftApp::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStor
 		{
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -6035,9 +6101,9 @@ int CMinecraftApp::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStor
 				DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 				const char *pchPackName=wstringtofilename(pDLCPack->getName());
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
-				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
+				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chSkuID[SCE_NP_COMMERCE2_SKU_ID_LEN];
@@ -6056,27 +6122,27 @@ int CMinecraftApp::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStor
 #if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__
 					if(app.CheckForEmptyStore(iPad)==false)
 #endif
-					{					
+					{
 						if(app.DLCAlreadyPurchased(chSkuID))
 						{
 							app.DownloadAlreadyPurchased(chSkuID);
 						}
 						else
 						{
-							app.Checkout(chSkuID);	
+							app.Checkout(chSkuID);
 						}
 					}
 				}
 			}
 		}
 	}
-#endif		//	
+#endif		//
 
 #ifdef _XBOX_ONE
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		if(ProfileManager.IsSignedIn(iPad))
-		{	
+		{
 			if (ProfileManager.IsSignedInLive(iPad))
 			{
 				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
@@ -6087,19 +6153,19 @@ int CMinecraftApp::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStor
 
 				DLC_INFO *pDLCInfo=app.GetDLCInfoForProductName((WCHAR *)pDLCPack->getName().c_str());
 
-				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),nullptr,nullptr);
 
-				// the license change coming in when the offer has been installed will cause this scene to refresh	
+				// the license change coming in when the offer has been installed will cause this scene to refresh
 			}
 			else
-			{	
+			{
 				// 4J-JEV: Fix for XB1: #165863 - XR-074: Compliance: With no active network connection user is unable to convert from Trial to Full texture pack and is not messaged why.
 				UINT uiIDA[1] = { IDS_CONFIRM_OK };
-				ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad); 
+				ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad);
 			}
 		}
 	}
-	
+
 #endif
 #ifdef _XBOX
 
@@ -6116,11 +6182,11 @@ int CMinecraftApp::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStor
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		if(ProfileManager.IsSignedIn(iPad))
-		{	
+		{
 			// need to allow downloads here, or the player would need to quit the game to let the download of a texture pack happen. This might affect the network traffic, since the download could take all the bandwidth...
 			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 		}
 	}
 	else
@@ -6136,7 +6202,7 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned(void *pParam,int iPad,C4
 	//CMinecraftApp* pClass = (CMinecraftApp*)pParam;
 
 	// results switched for this dialog
-	if(result==C4JStorage::EMessage_ResultDecline) 
+	if(result==C4JStorage::EMessage_ResultDecline)
 	{
 		INT saveOrCheckpointId = 0;
 
@@ -6148,7 +6214,7 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned(void *pParam,int iPad,C4
 
 			DLCPack * pDLCPack=tPack->getDLCPack();
 			if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
-			{					
+			{
 				// upsell
 				// get the dlc texture pack
 
@@ -6166,9 +6232,9 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned(void *pParam,int iPad,C4
 				uiIDA[1]=IDS_CONFIRM_CANCEL;
 
 				// Give the player a warning about the trial version of the texture pack
-				ui.RequestErrorMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad,&CMinecraftApp::WarningTrialTexturePackReturned,NULL);
+				ui.RequestErrorMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad,&CMinecraftApp::WarningTrialTexturePackReturned,nullptr);
 
-				return S_OK;					
+				return S_OK;
 			}
 		}
 		//bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
@@ -6183,7 +6249,7 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned(void *pParam,int iPad,C4
 int CMinecraftApp::ExitAndJoinFromInviteDeclineSaveReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
 	// results switched for this dialog
-	if(result==C4JStorage::EMessage_ResultDecline) 
+	if(result==C4JStorage::EMessage_ResultDecline)
 	{
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
 		StorageManager.SetSaveDisabled(false);
@@ -6372,7 +6438,7 @@ UINT CMinecraftApp::GetNextTip()
 	}
 	else
 	{
-		if(bShowSkinDLCTip && ProfileManager.IsFullVersion()) 
+		if(bShowSkinDLCTip && ProfileManager.IsFullVersion())
 		{
 			bShowSkinDLCTip=false;
 			if( app.DLCInstallProcessCompleted() )
@@ -6484,7 +6550,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DROP*}",			GetActionReplacement(iPad,MINECRAFT_ACTION_DROP			) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_CAMERA*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_RENDER_THIRD_PERSON	) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_MENU_PAGEDOWN*}",	GetActionReplacement(iPad,ACTION_MENU_PAGEDOWN	) );
-	text = replaceAll(text, L"{*CONTROLLER_ACTION_DISMOUNT*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_SNEAK_TOGGLE	) );	
+	text = replaceAll(text, L"{*CONTROLLER_ACTION_DISMOUNT*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_SNEAK_TOGGLE	) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_A*}",					GetVKReplacement(VK_PAD_A) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_B*}",					GetVKReplacement(VK_PAD_B) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_X*}",					GetVKReplacement(VK_PAD_X) );
@@ -6499,7 +6565,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
 	text = replaceAll(text, L"{*ICON_SHANK_03*}",					GetIconReplacement(XZP_ICON_SHANK_03) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_UP*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_UP			) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN		) );
-	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}",	GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT		) );	
+	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}",	GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT		) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT		) );
 #if defined _XBOX_ONE || defined __PSVITA__
 	text = replaceAll(text, L"{*CONTROLLER_VK_START*}",			GetVKReplacement(VK_PAD_START		) );
@@ -6515,13 +6581,13 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
 	text = replaceAll(text, L"{*IMAGEROOT*}", imageRoot);
 #endif // _XBOX
 
-	// Fix for #8903 - UI: Localization: KOR/JPN/CHT: Button Icons are rendered with padding space, which looks no good	
+	// Fix for #8903 - UI: Localization: KOR/JPN/CHT: Button Icons are rendered with padding space, which looks no good
 	DWORD dwLanguage = XGetLanguage( );
 	switch(dwLanguage)
 	{
-	case XC_LANGUAGE_KOREAN:	
+	case XC_LANGUAGE_KOREAN:
 	case XC_LANGUAGE_JAPANESE:
-	case XC_LANGUAGE_TCHINESE:		
+	case XC_LANGUAGE_TCHINESE:
 		text = replaceAll(text, L"&nbsp;", L"" );
 		break;
 	}
@@ -6664,7 +6730,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 	case VK_PAD_LTHUMB_UPLEFT   :
 	case VK_PAD_LTHUMB_UPRIGHT  :
 	case VK_PAD_LTHUMB_DOWNRIGHT:
-	case VK_PAD_LTHUMB_DOWNLEFT :	
+	case VK_PAD_LTHUMB_DOWNLEFT :
 		return app.GetString( IDS_CONTROLLER_LEFT_STICK );
 	case VK_PAD_RTHUMB_UP       :
 	case VK_PAD_RTHUMB_DOWN     :
@@ -6673,12 +6739,12 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 	case VK_PAD_RTHUMB_UPLEFT   :
 	case VK_PAD_RTHUMB_UPRIGHT  :
 	case VK_PAD_RTHUMB_DOWNRIGHT:
-	case VK_PAD_RTHUMB_DOWNLEFT :	
+	case VK_PAD_RTHUMB_DOWNLEFT :
 		return app.GetString( IDS_CONTROLLER_RIGHT_STICK );
 	default:
 		break;
 	}
-	return NULL;
+	return nullptr;
 #else
 	wstring replacement = L"";
 	switch(uiVKey)
@@ -6777,7 +6843,7 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 	default:
 		break;
 	}
-	return NULL;
+	return nullptr;
 #else
 	wchar_t string[128];
 
@@ -6832,11 +6898,11 @@ HRESULT CMinecraftApp::RegisterMojangData(WCHAR *pXuidName, PlayerUID xuid, WCHA
 {
 	HRESULT hr=S_OK;
 	eXUID eTempXuid=eXUID_Undefined;
-	MOJANG_DATA *pMojangData=NULL;
+	MOJANG_DATA *pMojangData=nullptr;
 
 	// ignore the names if we don't recognize them
-	if(pXuidName!=NULL)
-	{	
+    if (pXuidName != nullptr)
+    {
 		if( wcscmp( pXuidName, L"XUID_NOTCH" ) == 0 )
 		{
 			eTempXuid = eXUID_Notch; // might be needed for the apple at some point
@@ -6875,7 +6941,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR *pType, int iValue)
 	HRESULT hr=S_OK;
 
 	// #ifdef _XBOX
-	// 	if(pType!=NULL)
+	// 	if(pType!=nullptr)
 	// 	{	
 	// 		if(wcscmp(pType,L"XboxOneTransfer")==0)
 	// 		{
@@ -6892,7 +6958,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR *pType, int iValue)
 	// 		{
 	// 			app.m_uiTransferSlotC=iValue;
 	// 		}
-	// 
+	//
 	// 	}
 	// #endif
 
@@ -6901,7 +6967,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR *pType, int iValue)
 }
 
 #if (defined _XBOX || defined _WINDOWS64)
-HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGender, __uint64 ullOfferID_Full, __uint64 ullOfferID_Trial, WCHAR *pFirstSkin, unsigned int uiSortIndex, int iConfig, WCHAR *pDataFile)
+HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, WCHAR *pFirstSkin, unsigned int uiSortIndex, int iConfig, WCHAR *pDataFile)
 {
 	HRESULT hr=S_OK;
 	DLC_INFO *pDLCData=new DLC_INFO;
@@ -6916,17 +6982,17 @@ HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGe
 #ifndef __ORBIS__
 	// ignore the names if we don't recognize them
 	if(pBannerName!=L"")
-	{	
+	{
 		wcsncpy_s( pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE);
 	}
 
 	if(pDataFile[0]!=0)
-	{	
+	{
 		wcsncpy_s( pDLCData->wchDataFile, pDataFile, MAX_BANNERNAME_SIZE);
 	}
 #endif
 
-	if(pType!=NULL)
+	if(pType!=nullptr)
 	{	
 		if(wcscmp(pType,L"Skin")==0)
 		{
@@ -7006,12 +7072,12 @@ HRESULT CMinecraftApp::RegisterDLCData(eDLCContentType eType, WCHAR *pwchBannerN
 
 		// ignore the names if we don't recognize them
 		if(pwchBannerName!=L"")
-		{	
+		{
 			wcsncpy_s( pDLCData->wchBanner, pwchBannerName, MAX_BANNERNAME_SIZE);
 		}
 
 		if(pwchProductName[0]!=0)
-		{	
+		{
 			pDLCData->wsDisplayName=pwchProductName;
 		}
 
@@ -7053,7 +7119,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortInde
 
 	pDLCData->iConfig = app.GetiConfigFromName(pchDLCName);
 	pDLCData->uiSortIndex=uiSortIndex;
-	pDLCData->eDLCType = app.GetDLCTypeFromName(pchDLCName); 
+	pDLCData->eDLCType = app.GetDLCTypeFromName(pchDLCName);
 	strcpy(pDLCData->chImageURL,pchImageURL);
 	//bool bIsTrialDLC = app.GetTrialFromName(pchDLCName);
 
@@ -7111,7 +7177,7 @@ bool CMinecraftApp::GetDLCNameForPackID(const int iPackID,char **ppchKeyID)
 	auto it = DLCTextures_PackID.find(iPackID);
 	if( it == DLCTextures_PackID.end() )
 	{
-		*ppchKeyID=NULL;
+		*ppchKeyID=nullptr;
 		return false;
 	}
 	else
@@ -7125,27 +7191,27 @@ DLC_INFO *CMinecraftApp::GetDLCInfo(char *pchDLCName)
 	string tempString=pchDLCName;
 
 	if(DLCInfo.size()>0)
-	{	
+	{
 		auto it = DLCInfo.find(tempString);
 
 		if( it == DLCInfo.end() )
 		{
 			// nothing for this
-			return NULL;
+			return nullptr;
 		}
 		else
 		{
 			return it->second;
 		}
 	}
-	else return NULL;
+	else return nullptr;
 }
 
 DLC_INFO *CMinecraftApp::GetDLCInfoFromTPackID(int iTPID)
 {
 	unordered_map<string, DLC_INFO *>::iterator it= DLCInfo.begin();
 
-	for(int i=0;i<DLCInfo.size();i++)
+	for(size_t i=0;i<DLCInfo.size();i++)
 	{
 		if(((DLC_INFO *)it->second)->iConfig==iTPID)
 		{
@@ -7153,7 +7219,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoFromTPackID(int iTPID)
 		}
 		++it;
 	}
-	return NULL;
+	return nullptr;
 }
 
 DLC_INFO *CMinecraftApp::GetDLCInfo(int iIndex)
@@ -7198,7 +7264,7 @@ bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,wstring &Produc
 {
 	auto it = DLCTextures_PackID.find(iPackID);
 	if( it == DLCTextures_PackID.end() )
-	{		
+	{
 		return false;
 	}
 	else
@@ -7209,12 +7275,12 @@ bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,wstring &Produc
 }
 // DLC_INFO *CMinecraftApp::GetDLCInfoForTrialOfferID(wstring &ProductId)
 // {
-// 	return NULL;
+// 	return nullptr;
 // }
 
 DLC_INFO *CMinecraftApp::GetDLCInfoTrialOffer(int iIndex)
 {
-	return NULL;
+	return nullptr;
 }
 DLC_INFO *CMinecraftApp::GetDLCInfoFullOffer(int iIndex)
 {
@@ -7268,22 +7334,22 @@ bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,ULONGLONG *pull
 }
 DLC_INFO *CMinecraftApp::GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial)
 {
-	//DLC_INFO *pDLCInfo=NULL;
+	//DLC_INFO *pDLCInfo=nullptr;
 	if(DLCInfo_Trial.size()>0)
-	{	
+	{
 		auto it = DLCInfo_Trial.find(ullOfferID_Trial);
 
 		if( it == DLCInfo_Trial.end() )
 		{
 			// nothing for this
-			return NULL;
+			return nullptr;
 		}
 		else
 		{
 			return it->second;
 		}
 	}
-	else return NULL;
+	else return nullptr;
 }
 
 DLC_INFO *CMinecraftApp::GetDLCInfoTrialOffer(int iIndex)
@@ -7327,27 +7393,27 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(WCHAR *pwchProductID)
 {
 	wstring wsTemp = pwchProductID;
 	if(DLCInfo_Full.size()>0)
-	{	
+	{
 		auto it = DLCInfo_Full.find(wsTemp);
 
 		if( it == DLCInfo_Full.end() )
 		{
 			// nothing for this
-			return NULL;
+			return nullptr;
 		}
 		else
 		{
 			return it->second;
 		}
 	}
-	else return NULL;
+	else return nullptr;
 }
 DLC_INFO *CMinecraftApp::GetDLCInfoForProductName(WCHAR *pwchProductName)
 {
 	unordered_map<wstring, DLC_INFO *>::iterator it= DLCInfo_Full.begin();
 	wstring wsProductName=pwchProductName;
 
-	for(int i=0;i<DLCInfo_Full.size();i++)
+	for(size_t i=0;i<DLCInfo_Full.size();i++)
 	{
 		DLC_INFO *pDLCInfo=(DLC_INFO *)it->second;
 		if(wsProductName==pDLCInfo->wsDisplayName)
@@ -7357,7 +7423,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForProductName(WCHAR *pwchProductName)
 		++it;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 #elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
@@ -7367,20 +7433,20 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full)
 {
 
 	if(DLCInfo_Full.size()>0)
-	{	
+	{
 		auto it = DLCInfo_Full.find(ullOfferID_Full);
 
 		if( it == DLCInfo_Full.end() )
 		{
 			// nothing for this
-			return NULL;
+			return nullptr;
 		}
 		else
 		{
 			return it->second;
 		}
 	}
-	else return NULL;
+	else return nullptr;
 }
 #endif
 
@@ -7471,7 +7537,7 @@ void CMinecraftApp::ExitGameFromRemoteSave( LPVOID lpParameter )
 	uiIDA[0]=IDS_CONFIRM_CANCEL;
 	uiIDA[1]=IDS_CONFIRM_OK;
 
-	ui.RequestAlertMessage(IDS_EXIT_GAME, IDS_CONFIRM_EXIT_GAME, uiIDA, 2, primaryPad,&CMinecraftApp::ExitGameFromRemoteSaveDialogReturned,NULL);
+	ui.RequestAlertMessage(IDS_EXIT_GAME, IDS_CONFIRM_EXIT_GAME, uiIDA, 2, primaryPad,&CMinecraftApp::ExitGameFromRemoteSaveDialogReturned,nullptr);
 }
 
 int CMinecraftApp::ExitGameFromRemoteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
@@ -7479,17 +7545,17 @@ int CMinecraftApp::ExitGameFromRemoteSaveDialogReturned(void *pParam,int iPad,C4
 	//CScene_Pause* pClass = (CScene_Pause*)pParam;
 
 	// results switched for this dialog
-	if(result==C4JStorage::EMessage_ResultDecline) 
+	if(result==C4JStorage::EMessage_ResultDecline)
 	{
 		app.SetAction(iPad,eAppAction_ExitWorld);
 	}
-	else 
+	else
 	{
 #ifndef _XBOX
 		// Inform fullscreen progress scene that it's not being cancelled after all
-		UIScene_FullscreenProgress *pScene = (UIScene_FullscreenProgress *)ui.FindScene(eUIScene_FullscreenProgress);
+		UIScene_FullscreenProgress *pScene = static_cast<UIScene_FullscreenProgress *>(ui.FindScene(eUIScene_FullscreenProgress));
 #ifdef __PS3__
-		if(pScene!=NULL)
+		if(pScene!=nullptr)
 #else
 		if (pScene != nullptr)
 #endif
@@ -7505,7 +7571,7 @@ int CMinecraftApp::ExitGameFromRemoteSaveDialogReturned(void *pParam,int iPad,C4
 
 void CMinecraftApp::SetSpecialTutorialCompletionFlag(int iPad, int index)
 {
-	if(index >= 0 && index < 32 && GameSettingsA[iPad] != NULL)
+	if(index >= 0 && index < 32 && GameSettingsA[iPad] != nullptr)
 	{
 		GameSettingsA[iPad]->uiSpecialTutorialBitmask |= (1<<index);
 	}
@@ -7534,7 +7600,7 @@ void CMinecraftApp::InvalidateBannedList(int iPad)
 		if(BannedListA[iPad].pBannedList)
 		{
 			delete [] BannedListA[iPad].pBannedList;
-			BannedListA[iPad].pBannedList=NULL;
+			BannedListA[iPad].pBannedList=nullptr;
 		}
 	}
 }
@@ -7563,10 +7629,10 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, char *ps
 	strcpy(pBannedListData->pszLevelName,pszLevelName);
 	m_vBannedListA[iPad]->push_back(pBannedListData);
 
-	if(bWriteToTMS)
-	{	
-		DWORD dwDataBytes=(DWORD)(sizeof(BANNEDLISTDATA)*m_vBannedListA[iPad]->size());
-		PBANNEDLISTDATA pBannedList = (BANNEDLISTDATA *)(new CHAR [dwDataBytes]);
+    if (bWriteToTMS)
+    {
+        DWORD dwDataBytes = static_cast<DWORD>(sizeof(BANNEDLISTDATA)* m_vBannedListA[iPad]->size());
+		PBANNEDLISTDATA pBannedList = reinterpret_cast<BANNEDLISTDATA*>(new CHAR [dwDataBytes]);
 		int iCount=0;
 		for (PBANNEDLISTDATA pData : *m_vBannedListA[iPad] )
 		{
@@ -7577,9 +7643,9 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, char *ps
 
 		//bool bRes=StorageManager.WriteTMSFile(iPad,C4JStorage::eGlobalStorage_TitleUser,L"BannedList",(PBYTE)pBannedList, dwDataBytes);
 #ifdef _XBOX
-		StorageManager.TMSPP_WriteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,C4JStorage::TMS_UGCTYPE_NONE,"BannedList",(PCHAR) pBannedList, dwDataBytes,NULL,NULL, 0);
+		StorageManager.TMSPP_WriteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,C4JStorage::TMS_UGCTYPE_NONE,"BannedList",(PCHAR) pBannedList, dwDataBytes,nullptr,nullptr, 0);
 #elif defined _XBOX_ONE
-		StorageManager.TMSPP_WriteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"BannedList",(PBYTE) pBannedList, dwDataBytes,NULL,NULL, 0);
+		StorageManager.TMSPP_WriteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"BannedList",(PBYTE) pBannedList, dwDataBytes,nullptr,nullptr, 0);
 #endif
 	}
 	// update telemetry too
@@ -7592,7 +7658,7 @@ bool CMinecraftApp::IsInBannedLevelList(int iPad, PlayerUID xuid, char *pszLevel
 #ifdef _XBOX_ONE
 		PlayerUID bannedPlayerUID = pData->wchPlayerUID;
 		if(IsEqualXUID (bannedPlayerUID,xuid) && (strcmp(pData->pszLevelName,pszLevelName)==0))
-#else		
+#else
 		if(IsEqualXUID (pData->xuid,xuid) && (strcmp(pData->pszLevelName,pszLevelName)==0))
 #endif
 		{
@@ -7613,7 +7679,7 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, cha
 	{
 		PBANNEDLISTDATA pBannedListData = *it;
 
-		if(pBannedListData!=NULL)
+		if(pBannedListData!=nullptr)
 		{
 #ifdef _XBOX_ONE
 			PlayerUID bannedPlayerUID = pBannedListData->wchPlayerUID;
@@ -7638,22 +7704,22 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, cha
 		}
 	}
 
-	DWORD dwDataBytes=(DWORD)(sizeof(BANNEDLISTDATA)*m_vBannedListA[iPad]->size());
+	DWORD dwDataBytes=static_cast<DWORD>(sizeof(BANNEDLISTDATA) * m_vBannedListA[iPad]->size());
 	if(dwDataBytes==0)
 	{
 		// wipe the file
 #ifdef _XBOX
 		StorageManager.DeleteTMSFile(iPad,C4JStorage::eGlobalStorage_TitleUser,L"BannedList");
 #elif defined _XBOX_ONE
-		StorageManager.TMSPP_DeleteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"BannedList",NULL,NULL, 0);
+		StorageManager.TMSPP_DeleteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"BannedList",nullptr,nullptr, 0);
 #endif
 	}
 	else
 	{
 		PBANNEDLISTDATA pBannedList = (BANNEDLISTDATA *)(new BYTE [dwDataBytes]);
 
-		int iSize=(int)m_vBannedListA[iPad]->size();
-		for(int i=0;i<iSize;i++)
+		size_t iSize=m_vBannedListA[iPad]->size();
+		for(size_t i=0;i<iSize;i++)
 		{
 			PBANNEDLISTDATA pBannedListData =m_vBannedListA[iPad]->at(i);
 
@@ -7662,7 +7728,7 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, cha
 #ifdef _XBOX
 		StorageManager.WriteTMSFile(iPad,C4JStorage::eGlobalStorage_TitleUser,L"BannedList",(PBYTE)pBannedList, dwDataBytes);
 #elif defined _XBOX_ONE
-		StorageManager.TMSPP_WriteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"BannedList",(PBYTE) pBannedList, dwDataBytes,NULL,NULL, 0);
+		StorageManager.TMSPP_WriteFile(iPad,C4JStorage::eGlobalStorage_TitleUser,C4JStorage::TMS_FILETYPE_BINARY,L"BannedList",(PBYTE) pBannedList, dwDataBytes,nullptr,nullptr, 0);
 #endif
 		delete [] pBannedList;
 	}
@@ -7693,7 +7759,7 @@ bool CMinecraftApp::AlreadySeenCreditText(const wstring &wstemp)
 		wstring temp=m_vCreditText.at(i);
 
 		// if they are the same, break out of the case
-		if(temp.compare(wstemp)==0) 
+		if(temp.compare(wstemp)==0)
 		{
 			return true;
 		}
@@ -7706,7 +7772,7 @@ bool CMinecraftApp::AlreadySeenCreditText(const wstring &wstemp)
 
 unsigned int CMinecraftApp::GetDLCCreditsCount()
 {
-	return (unsigned int)vDLCCredits.size();
+	return static_cast<unsigned int>(vDLCCredits.size());
 }
 
 SCreditTextItemDef * CMinecraftApp::GetDLCCredits(int iIndex)
@@ -8081,7 +8147,7 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, eGame
 		break;
 	case eGameHostOption_FireSpreads:
 		return (uiHostSettings&GAME_HOST_OPTION_BITMASK_FIRESPREADS);
-		break;	
+		break;
 	case eGameHostOption_CheatsEnabled:
 		return (uiHostSettings&(GAME_HOST_OPTION_BITMASK_HOSTFLY|GAME_HOST_OPTION_BITMASK_HOSTHUNGER|GAME_HOST_OPTION_BITMASK_HOSTINVISIBLE));
 		break;
@@ -8099,7 +8165,7 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, eGame
 		break;
 	case eGameHostOption_DisableSaving:
 		return (uiHostSettings&GAME_HOST_OPTION_BITMASK_DISABLESAVE);
-		break;		
+		break;
 	case eGameHostOption_WasntSaveOwner:
 		return (uiHostSettings&GAME_HOST_OPTION_BITMASK_NOTOWNER);
 	case eGameHostOption_WorldSize:
@@ -8118,7 +8184,7 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, eGame
 		return !(uiHostSettings&GAME_HOST_OPTION_BITMASK_NATURALREGEN);
 	case eGameHostOption_DoDaylightCycle:
 		return !(uiHostSettings&GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE);
-		break;		
+		break;
 	}
 
 	return false;
@@ -8126,7 +8192,7 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, eGame
 
 bool CMinecraftApp::CanRecordStatsAndAchievements()
 {
-	bool isTutorial = Minecraft::GetInstance() != NULL && Minecraft::GetInstance()->isTutorial();
+	bool isTutorial = Minecraft::GetInstance() != nullptr && Minecraft::GetInstance()->isTutorial();
 	// 4J Stu - All of these options give the host player some advantage, so should not allow achievements
 	return !(app.GetGameHostOption(eGameHostOption_HasBeenInCreative) ||
 		app.GetGameHostOption(eGameHostOption_HostCanBeInvisible) ||
@@ -8178,7 +8244,7 @@ unsigned int CMinecraftApp::FromBigEndian(unsigned int uiValue)
 	// Keep it in big endian
 	return uiValue;
 #else
-	unsigned int uiReturn = ( ( uiValue >> 24 ) & 0x000000ff ) | 
+	unsigned int uiReturn = ( ( uiValue >> 24 ) & 0x000000ff ) |
 		( ( uiValue >> 8 )  & 0x0000ff00 ) |
 		( ( uiValue << 8 )  & 0x00ff0000 ) |
 		( ( uiValue << 24 ) & 0xff000000 );
@@ -8204,7 +8270,7 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 	uiCount+=8;
 
 	while(uiCount<dwImageBytes)
-	{	
+	{
 		uiChunkLen=*(unsigned int *)&ucPtr[uiCount];
 		uiChunkLen=FromBigEndian(uiChunkLen);
 		uiCount+=sizeof(int);
@@ -8228,7 +8294,7 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 				pszKeyword++;
 				if(strcmp(szKeyword,"4J_SEED")==0)
 				{
-					// read the seed value					
+					// read the seed value
 					unsigned int uiValueC=0;
 					while(*pszKeyword!=0 && (pszKeyword < ucPtr + uiCount + uiChunkLen) )
 					{
@@ -8240,7 +8306,7 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 				else if(strcmp(szKeyword,"4J_HOSTOPTIONS")==0)
 				{
 					bHostOptionsRead = true;
-					// read the host options value					
+					// read the host options value
 					unsigned int uiValueC=0;
 					unsigned char pszHostOptions[9]; // Hex representation of unsigned int
 					ZeroMemory(&pszHostOptions,9);
@@ -8257,7 +8323,7 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 				}
 				else if(strcmp(szKeyword,"4J_TEXTUREPACK")==0)
 				{
-					// read the texture pack value					
+					// read the texture pack value
 					unsigned int uiValueC=0;
 					unsigned char pszTexturePack[9]; // Hex representation of unsigned int
 					ZeroMemory(&pszTexturePack,9);
@@ -8282,7 +8348,7 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 	return;
 }
 
-unsigned int CMinecraftApp::CreateImageTextData(PBYTE bTextMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId)
+unsigned int CMinecraftApp::CreateImageTextData(PBYTE bTextMetadata, int64_t seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId)
 {
 	int iTextMetadataBytes = 0;
 	if(hasSeed)
@@ -8349,7 +8415,7 @@ bool CMinecraftApp::GetTerrainFeaturePosition(_eTerrainFeatureType eType,int *pX
 			*pX=pFeatureData->x;
 			*pZ=pFeatureData->z;
 			return true;
-		}		
+		}
 	}
 
 	return false;
@@ -8494,7 +8560,7 @@ unsigned int CMinecraftApp::AddDLCRequest(eDLCMarketplaceType eType, bool bPromo
 			{
 				// promote
 				if(bPromote)
-				{			
+				{
 					m_DLCDownloadQueue.erase(m_DLCDownloadQueue.begin()+iPosition);
 					m_DLCDownloadQueue.insert(m_DLCDownloadQueue.begin(),pCurrent);
 				}
@@ -8506,10 +8572,10 @@ unsigned int CMinecraftApp::AddDLCRequest(eDLCMarketplaceType eType, bool bPromo
 	}
 
 	DLCRequest *pDLCreq = new DLCRequest;
-	pDLCreq->dwType=m_dwContentTypeA[eType];	
+	pDLCreq->dwType=m_dwContentTypeA[eType];
 	pDLCreq->eState=e_DLC_ContentState_Idle;
 
-	m_DLCDownloadQueue.push_back(pDLCreq);	
+	m_DLCDownloadQueue.push_back(pDLCreq);
 
 	m_bAllDLCContentRetrieved=false;
 	LeaveCriticalSection(&csDLCDownloadQueue);
@@ -8541,7 +8607,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 	{
 	// promote
 	if(bPromote)
-	{			
+	{
 	m_TMSPPDownloadQueue.erase(m_TMSPPDownloadQueue.begin()+iPosition);
 	m_TMSPPDownloadQueue.insert(m_TMSPPDownloadQueue.begin(),pCurrent);
 	bPromoted=true;
@@ -8575,17 +8641,17 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 			{
 				// first check if the image is already in the memory textures, since we might be loading some from the Title Update partition
 				if(pDLC->wchDataFile[0]!=0)
-				{		
+				{
 					//WCHAR *cString = pDLC->wchDataFile;
 					// 4J-PB - shouldn't check this here - let the TMS files override it, so if they are on TMS, we'll take them first
 					//int iIndex = app.GetLocalTMSFileIndex(pDLC->wchDataFile,true);
 
 					//if(iIndex!=-1)
-					{			
+					{
 						bool bPresent = app.IsFileInTPD(pDLC->iConfig);
 
 						if(!bPresent)
-						{	
+						{
 							// this may already be present in the vector because of a previous trial/full offer
 
 							bool bAlreadyInQueue=false;
@@ -8599,7 +8665,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 							}
 
 							if(!bAlreadyInQueue)
-							{			
+							{
 								TMSPPRequest *pTMSPPreq = new TMSPPRequest;
 
 								pTMSPPreq->CallbackFunc=&CMinecraftApp::TMSPPFileReturned;
@@ -8611,7 +8677,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 								pTMSPPreq->eState=e_TMS_ContentState_Queued;
 								m_bAllTMSContentRetrieved=false;
 								m_TMSPPDownloadQueue.push_back(pTMSPPreq);
-							}	
+							}
 						}
 						else
 						{
@@ -8635,20 +8701,20 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 
 			// is this the right type?
 			if(pDLC->eDLCType==eType)
-			{	
+			{
 
 				WCHAR *cString = pDLC->wchBanner;
 
 				// 4J-PB - shouldn't check this here - let the TMS files override it, so if they are on TMS, we'll take them first
-				// is the file in the TMS XZP?	 
+				// is the file in the TMS XZP?
 				//int iIndex = app.GetLocalTMSFileIndex(cString,true);
 
 				//if(iIndex!=-1)
-				{			
-					bool bPresent = app.IsFileInMemoryTextures(cString);		
+				{
+					bool bPresent = app.IsFileInMemoryTextures(cString);
 
 					if(!bPresent) // retrieve it from TMSPP
-					{		
+					{
 						bool bAlreadyInQueue=false;
 						for( TMSPPRequest  *pCurrent : m_TMSPPDownloadQueue )
 						{
@@ -8660,7 +8726,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 						}
 
 						if(!bAlreadyInQueue)
-						{			
+						{
 							TMSPPRequest *pTMSPPreq = new TMSPPRequest;
 
 							pTMSPPreq->CallbackFunc=&CMinecraftApp::TMSPPFileReturned;
@@ -8673,7 +8739,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 							pTMSPPreq->eState=e_TMS_ContentState_Queued;
 
 							m_bAllTMSContentRetrieved=false;
-							m_TMSPPDownloadQueue.push_back(pTMSPPreq);	
+							m_TMSPPDownloadQueue.push_back(pTMSPPreq);
 							app.DebugPrintf("===m_TMSPPDownloadQueue Adding %ls, q size is %d\n",pTMSPPreq->wchFilename,m_TMSPPDownloadQueue.size());
 						}
 					}
@@ -8697,11 +8763,11 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 				//int iIndex = app.GetLocalTMSFileIndex(cString,true);
 
 				//if(iIndex!=-1)
-				{			
+				{
 					bool bPresent = app.IsFileInMemoryTextures(cString);
 
 					if(!bPresent)
-					{	
+					{
 						// this may already be present in the vector because of a previous trial/full offer
 
 						bool bAlreadyInQueue=false;
@@ -8715,7 +8781,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 						}
 
 						if(!bAlreadyInQueue)
-						{			
+						{
 							//app.DebugPrintf("Adding a request to the TMSPP download queue - %ls\n",pDLC->wchBanner);
 							TMSPPRequest *pTMSPPreq = new TMSPPRequest;
 							ZeroMemory(pTMSPPreq,sizeof(TMSPPRequest));
@@ -8734,7 +8800,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
 							m_bAllTMSContentRetrieved=false;
 							m_TMSPPDownloadQueue.push_back(pTMSPPreq);
 							app.DebugPrintf("===m_TMSPPDownloadQueue Adding %ls, q size is %d\n",pTMSPPreq->wchFilename,m_TMSPPDownloadQueue.size());
-						}	
+						}
 					}
 				}
 			}
@@ -8825,7 +8891,7 @@ int CMinecraftApp::TMSPPFileReturned(LPVOID pParam,int iPad,int iUserData,C4JSto
 {
 #endif
 
-	CMinecraftApp* pClass = (CMinecraftApp *) pParam;
+	CMinecraftApp* pClass = static_cast<CMinecraftApp *>(pParam);
 
 	// find the right one in the vector
 	EnterCriticalSection(&pClass->csTMSPPDownloadQueue);
@@ -8844,16 +8910,15 @@ int CMinecraftApp::TMSPPFileReturned(LPVOID pParam,int iPad,int iUserData,C4JSto
 			// set this to retrieved whether it found it or not
 			pCurrent->eState=e_TMS_ContentState_Retrieved;
 
-			if(pFileData!=NULL)
+			if(pFileData!=nullptr)
 			{	
-
 #ifdef _XBOX_ONE
 
 
 				switch(pCurrent->eType)
 				{
 				case e_DLC_TexturePackData:
-					{					
+					{
 						// 4J-PB - we need to allocate memory for the file data and copy into it, since the current data is a reference into the blob download memory
 						PBYTE pbData = new BYTE [pFileData->dwSize];
 						memcpy(pbData,pFileData->pbData,pFileData->dwSize);
@@ -8862,13 +8927,13 @@ int CMinecraftApp::TMSPPFileReturned(LPVOID pParam,int iPad,int iUserData,C4JSto
 						app.DebugPrintf("Got texturepack data\n");
 						// get the config value for the texture pack
 						int iConfig=app.GetTPConfigVal(pCurrent->wchFilename);
-						app.AddMemoryTPDFile(iConfig, pbData, pFileData->dwSize);					
+						app.AddMemoryTPDFile(iConfig, pbData, pFileData->dwSize);
 					}
 					break;
 				default:
 					// 4J-PB - check the data is an image
 					if(pFileData->pbData[0]==0x89)
-					{				
+					{
 						// 4J-PB - we need to allocate memory for the file data and copy into it, since the current data is a reference into the blob download memory
 						PBYTE pbData = new BYTE [pFileData->dwSize];
 						memcpy(pbData,pFileData->pbData,pFileData->dwSize);
@@ -8888,11 +8953,11 @@ int CMinecraftApp::TMSPPFileReturned(LPVOID pParam,int iPad,int iUserData,C4JSto
 				switch(pCurrent->eType)
 				{
 				case e_DLC_TexturePackData:
-					{					
+					{
 						app.DebugPrintf("--- Got texturepack data %ls\n",pCurrent->wchFilename);
 						// get the config value for the texture pack
 						int iConfig=app.GetTPConfigVal(pCurrent->wchFilename);
-						app.AddMemoryTPDFile(iConfig, pFileData->pbData, pFileData->dwSize);					
+						app.AddMemoryTPDFile(iConfig, pFileData->pbData, pFileData->dwSize);
 					}
 					break;
 				default:
@@ -9086,7 +9151,7 @@ void  CMinecraftApp::ClearTMSPPFilesRetrieved()
 
 int CMinecraftApp::DLCOffersReturned(void *pParam, int iOfferC, DWORD dwType, int iPad)
 {
-	CMinecraftApp* pClass = (CMinecraftApp *) pParam;
+	CMinecraftApp* pClass = static_cast<CMinecraftApp *>(pParam);
 
 	// find the right one in the vector
 	EnterCriticalSection(&pClass->csTMSPPDownloadQueue);
@@ -9111,10 +9176,10 @@ eDLCContentType CMinecraftApp::Find_eDLCContentType(DWORD dwType)
 	{
 		if(m_dwContentTypeA[i]==dwType)
 		{
-			return (eDLCContentType)i;
+			return static_cast<eDLCContentType>(i);
 		}
 	}
-	return (eDLCContentType)0;
+	return static_cast<eDLCContentType>(0);
 }
 bool CMinecraftApp::DLCContentRetrieved(eDLCMarketplaceType eType)
 {
@@ -9149,7 +9214,7 @@ void CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, SKIN_BOX *SkinBoxA, D
 	for(unsigned int i=0;i<dwSkinBoxC;i++)
 	{
 		if(pModel)
-		{			
+		{
 			ModelPart *pModelPart=pModel->AddOrRetrievePart(&SkinBoxA[i]);
 			pvModelPart->push_back(pModelPart);
 			pvSkinBoxes->push_back(&SkinBoxA[i]);
@@ -9179,7 +9244,7 @@ vector<ModelPart *> * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, vect
 	for( auto& it : *pvSkinBoxA )
 	{
 		if(pModel)
-		{			
+		{
 			ModelPart *pModelPart=pModel->AddOrRetrievePart(it);
 			pvModelPart->push_back(pModelPart);
 		}
@@ -9197,7 +9262,7 @@ vector<ModelPart *> * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, vect
 vector<ModelPart *> *CMinecraftApp::GetAdditionalModelParts(DWORD dwSkinID)
 {
 	EnterCriticalSection( &csAdditionalModelParts );
-	vector<ModelPart *> *pvModelParts=NULL;
+	vector<ModelPart *> *pvModelParts=nullptr;
 	if(m_AdditionalModelParts.size()>0)
 	{
 		auto it = m_AdditionalModelParts.find(dwSkinID);
@@ -9214,7 +9279,7 @@ vector<ModelPart *> *CMinecraftApp::GetAdditionalModelParts(DWORD dwSkinID)
 vector<SKIN_BOX *> *CMinecraftApp::GetAdditionalSkinBoxes(DWORD dwSkinID)
 {
 	EnterCriticalSection( &csAdditionalSkinBoxes );
-	vector<SKIN_BOX *> *pvSkinBoxes=NULL;
+	vector<SKIN_BOX *> *pvSkinBoxes=nullptr;
 	if(m_AdditionalSkinBoxes.size()>0)
 	{
 		auto it = m_AdditionalSkinBoxes.find(dwSkinID);
@@ -9266,7 +9331,7 @@ void CMinecraftApp::SetAnimOverrideBitmask(DWORD dwSkinID,unsigned int uiAnimOve
 
 DWORD CMinecraftApp::getSkinIdFromPath(const wstring &skin)
 {
-	bool dlcSkin = false; 
+	bool dlcSkin = false;
 	unsigned int skinId = 0;
 
 	if(skin.size() >= 14)
@@ -9318,95 +9383,92 @@ wstring CMinecraftApp::getSkinPathFromId(DWORD skinId)
 }
 
 
-int CMinecraftApp::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
+int CMinecraftApp::TexturePackDialogReturned(void* pParam, int iPad, C4JStorage::EMessageResult result)
 {
 
-
 #if defined __PSVITA__ || defined __PS3__ || defined __ORBIS__
-	if(result==C4JStorage::EMessage_ResultAccept) 
-	{
-		Minecraft *pMinecraft = Minecraft::GetInstance();
-		if( pMinecraft->skins->selectTexturePackById(app.GetRequiredTexturePackID()) )
-		{
-			// it's been installed already
-		}
-		else
-		{
-			// we need to enable background downloading for the DLC
-			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
-			SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(app.GetRequiredTexturePackID());		
-			if(pSONYDLCInfo!=NULL)
-			{
-				char chName[42];
-				char chKeyName[20];
-				char chSkuID[SCE_NP_COMMERCE2_SKU_ID_LEN];
-
-				memset(chSkuID,0,SCE_NP_COMMERCE2_SKU_ID_LEN);
-				// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
-				// So we assume the first sku for the product is the one we want
-				// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
-				memset(chKeyName, 0, sizeof(chKeyName));
-				strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
-
-	#ifdef __ORBIS__
-				strcpy(chName, chKeyName);
-	#else
-				sprintf(chName,"%s-%s",app.GetCommerceCategory(),chKeyName);
-	#endif
-				app.GetDLCSkuIDFromProductList(chName,chSkuID);
-				// 4J-PB - need to check for an empty store
-				if(app.CheckForEmptyStore(iPad)==false)
-				{
-					if(app.DLCAlreadyPurchased(chSkuID))
-					{
-						app.DownloadAlreadyPurchased(chSkuID);
-					}
-					else
-					{
-						app.Checkout(chSkuID);	
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		app.DebugPrintf("Continuing without installing texture pack\n");
-	}
+    if (result == C4JStorage::EMessage_ResultAccept)
+    {
+        Minecraft* pMinecraft = Minecraft::GetInstance();
+        if (pMinecraft->skins->selectTexturePackById(app.GetRequiredTexturePackID()))
+        {
+            // it's been installed already
+        }
+        else
+        {
+            // we need to enable background downloading for the DLC
+            XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
+
+            SONYDLC* pSONYDLCInfo = app.GetSONYDLCInfo(app.GetRequiredTexturePackID());
+            if (pSONYDLCInfo != nullptr)
+            {
+                char chName[42];
+                char chKeyName[20];
+                char chSkuID[SCE_NP_COMMERCE2_SKU_ID_LEN];
+
+                memset(chSkuID, 0, SCE_NP_COMMERCE2_SKU_ID_LEN);
+
+                memset(chKeyName, 0, sizeof(chKeyName));
+                strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
+
+    #ifdef __ORBIS__
+                strcpy(chName, chKeyName);
+    #else
+                sprintf(chName, "%s-%s", app.GetCommerceCategory(), chKeyName);
+    #endif
+
+                app.GetDLCSkuIDFromProductList(chName, chSkuID);
+
+                if (app.CheckForEmptyStore(iPad) == false)
+                {
+                    if (app.DLCAlreadyPurchased(chSkuID))
+                    {
+                        app.DownloadAlreadyPurchased(chSkuID);
+                    }
+                    else
+                    {
+                        app.Checkout(chSkuID);
+                    }
+                }
+            }
+        }
+    }
+    else
+    {
+        app.DebugPrintf("Continuing without installing texture pack\n");
+    }
 #endif
 
 #ifdef _XBOX
-	if(result!=C4JStorage::EMessage_Cancelled)
-	{
-		if(app.GetRequiredTexturePackID()!=0)
-		{	
-			// we need to enable background downloading for the DLC
-			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
-
-			ULONGLONG ullOfferID_Full;
-			ULONGLONG ullIndexA[1];
-			app.GetDLCFullOfferIDForPackID(app.GetRequiredTexturePackID(),&ullOfferID_Full);
-
-			if( result==C4JStorage::EMessage_ResultAccept ) // Full version
-			{
-				ullIndexA[0]=ullOfferID_Full;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
-			}
-			else // trial version
-			{
-				DLC_INFO *pDLCInfo=app.GetDLCInfoForFullOfferID(ullOfferID_Full);
-				ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
-			}	
-		}
-	}
+    if (result != C4JStorage::EMessage_Cancelled)
+    {
+        if (app.GetRequiredTexturePackID() != 0)
+        {
+            XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
+
+            ULONGLONG ullOfferID_Full;
+            ULONGLONG ullIndexA[1];
+            app.GetDLCFullOfferIDForPackID(app.GetRequiredTexturePackID(), &ullOfferID_Full);
+
+            if (result == C4JStorage::EMessage_ResultAccept)
+            {
+                ullIndexA[0] = ullOfferID_Full;
+                StorageManager.InstallOffer(1, ullIndexA, nullptr, nullptr);
+            }
+            else
+            {
+                DLC_INFO* pDLCInfo = app.GetDLCInfoForFullOfferID(ullOfferID_Full);
+                ullIndexA[0] = pDLCInfo->ullOfferID_Trial;
+                StorageManager.InstallOffer(1, ullIndexA, nullptr, nullptr);
+            }
+        }
+    }
 #endif
-	return 0;
+    return 0;
 }
-
 int CMinecraftApp::getArchiveFileSize(const wstring &filename)
 {
-	TexturePack *tPack = NULL;
+	TexturePack *tPack = nullptr;
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	if(pMinecraft && pMinecraft->skins) tPack = pMinecraft->skins->getSelected();
 	if(tPack && tPack->hasData() && tPack->getArchiveFile() && tPack->getArchiveFile()->hasFile(filename))
@@ -9418,7 +9480,7 @@ int CMinecraftApp::getArchiveFileSize(const wstring &filename)
 
 bool CMinecraftApp::hasArchiveFile(const wstring &filename)
 {
-	TexturePack *tPack = NULL;
+	TexturePack *tPack = nullptr;
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	if(pMinecraft && pMinecraft->skins) tPack = pMinecraft->skins->getSelected();
 	if(tPack && tPack->hasData() && tPack->getArchiveFile() && tPack->getArchiveFile()->hasFile(filename)) return true;
@@ -9427,7 +9489,7 @@ bool CMinecraftApp::hasArchiveFile(const wstring &filename)
 
 byteArray CMinecraftApp::getArchiveFile(const wstring &filename)
 {
-	TexturePack *tPack = NULL;
+	TexturePack *tPack = nullptr;
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	if(pMinecraft && pMinecraft->skins) tPack = pMinecraft->skins->getSelected();
 	if(tPack && tPack->hasData() && tPack->getArchiveFile() && tPack->getArchiveFile()->hasFile(filename))
@@ -9440,39 +9502,39 @@ byteArray CMinecraftApp::getArchiveFile(const wstring &filename)
 // DLC
 
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
-int CMinecraftApp::GetDLCInfoCount() 
-{ 
+int CMinecraftApp::GetDLCInfoCount()
+{
 	return (int)DLCInfo.size();
 }
 #elif defined _XBOX_ONE
-int CMinecraftApp::GetDLCInfoTrialOffersCount() 
-{ 
+int CMinecraftApp::GetDLCInfoTrialOffersCount()
+{
 	return 0;
 }
 
-int CMinecraftApp::GetDLCInfoFullOffersCount() 
-{ 
+int CMinecraftApp::GetDLCInfoFullOffersCount()
+{
 	return (int)DLCInfo_Full.size();
 }
 #else
-int CMinecraftApp::GetDLCInfoTrialOffersCount() 
+int CMinecraftApp::GetDLCInfoTrialOffersCount()
 { 
-	return (int)DLCInfo_Trial.size();
+    return static_cast<int>(DLCInfo_Trial.size());
 }
 
 int CMinecraftApp::GetDLCInfoFullOffersCount() 
 { 
-	return (int)DLCInfo_Full.size();
+    return static_cast<int>(DLCInfo_Full.size());
 }
 #endif
 
-int CMinecraftApp::GetDLCInfoTexturesOffersCount() 
+int CMinecraftApp::GetDLCInfoTexturesOffersCount()
 { 
-	return (int)DLCTextures_PackID.size();
+    return static_cast<int>(DLCTextures_PackID.size());
 }
 
 // AUTOSAVE
-void CMinecraftApp::SetAutosaveTimerTime(void)				
+void CMinecraftApp::SetAutosaveTimerTime(void)
 {
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
 	m_uiAutosaveTimer= GetTickCount()+1000*60;
@@ -9481,23 +9543,23 @@ void CMinecraftApp::SetAutosaveTimerTime(void)
 #endif
 }// value x 15 to get mins, x60 for secs
 
-bool CMinecraftApp::AutosaveDue(void)						
-{ 
+bool CMinecraftApp::AutosaveDue(void)
+{
 	return (GetTickCount()>m_uiAutosaveTimer);
 }
 
-unsigned int CMinecraftApp::SecondsToAutosave()			
-{ 
-	return (m_uiAutosaveTimer - GetTickCount() ) / 1000; 
+unsigned int CMinecraftApp::SecondsToAutosave()
+{
+	return (m_uiAutosaveTimer - GetTickCount() ) / 1000;
 }
 
-void CMinecraftApp::SetTrialTimerStart(void)	
+void CMinecraftApp::SetTrialTimerStart(void)
 {
 	m_fTrialTimerStart=m_Time.fAppTime; mfTrialPausedTime=0.0f;
 }
 
-float CMinecraftApp::getTrialTimer(void)		
-{ 
+float CMinecraftApp::getTrialTimer(void)
+{
 	return m_Time.fAppTime-m_fTrialTimerStart-mfTrialPausedTime;
 }
 
@@ -9532,7 +9594,7 @@ bool CMinecraftApp::IsLocalMultiplayerAvailable()
 	//#else
 	//		for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 	//		{
-	//			if( (i!=userIndex) && (InputManager.IsPadConnected(i) || ProfileManager.IsSignedIn(i)) ) 
+	//			if( (i!=userIndex) && (InputManager.IsPadConnected(i) || ProfileManager.IsSignedIn(i)) )
 	//			{
 	//				iOtherConnectedControllers++;
 	//			}
@@ -9607,7 +9669,7 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
 		case XC_LOCALE_UNITED_ARAB_EMIRATES:
 		case XC_LOCALE_GREAT_BRITAIN:
 			locales.push_back(eMCLang_enGB);
-			break;	
+			break;
 		default: //XC_LOCALE_UNITED_STATES
 			break;
 		}
@@ -9707,7 +9769,7 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
 		break;
 	case XC_LANGUAGE_BNORWEGIAN         :
 		locales.push_back(eMCLang_nbNO);
-		locales.push_back(eMCLang_noNO);	
+		locales.push_back(eMCLang_noNO);
 		locales.push_back(eMCLang_nnNO);
 		break;
 	case XC_LANGUAGE_DUTCH              :
@@ -9768,7 +9830,7 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
 	locales.push_back(eMCLang_enUS);
 	locales.push_back(eMCLang_null);
 
-	for (int i=0; i<locales.size(); i++)
+	for (size_t i=0; i<locales.size(); i++)
 	{
 		eMCLang lang = locales.at(i);
 		vecWstrLocales.push_back( m_localeA[lang] );
diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h
index ec36b765..0c1c261e 100644
--- a/Minecraft.Client/Common/Consoles_App.h
+++ b/Minecraft.Client/Common/Consoles_App.h
@@ -28,7 +28,7 @@ typedef struct _JoinFromInviteData
 	DWORD dwUserIndex; // dwUserIndex
 	DWORD dwLocalUsersMask;   // dwUserMask
 	const INVITE_INFO *pInviteInfo;  // pInviteInfo
-} 
+}
 JoinFromInviteData;
 
 class Player;
@@ -55,7 +55,7 @@ class Merchant;
 
 class CMinecraftAudio;
 
-class CMinecraftApp 
+class CMinecraftApp
 
 #ifdef _XBOX
 	: public CXuiModule
@@ -92,7 +92,7 @@ public:
 
 #ifdef _EXTENDED_ACHIEVEMENTS
 	/* 4J-JEV:
-	* We need more space in the profile data because of the new achievements and statistics 
+	* We need more space in the profile data because of the new achievements and statistics
 	* necessary for the new expanded achievement set.
 	*/
 	static const int GAME_DEFINED_PROFILE_DATA_BYTES = 2*972; // per user
@@ -163,12 +163,12 @@ public:
 	eXuiAction      GetGlobalXuiAction()																								{return m_eGlobalXuiAction;}
 	void			SetGlobalXuiAction(eXuiAction action)																				{m_eGlobalXuiAction=action;}
 	eXuiAction      GetXuiAction(int iPad)																								{return m_eXuiAction[iPad];}
-	void			SetAction(int iPad, eXuiAction action, LPVOID param = NULL);
-	void			SetTMSAction(int iPad, eTMSAction action)																			{m_eTMSAction[iPad]=action; }	
+    void SetAction(int iPad, eXuiAction action, LPVOID param = nullptr);
+    void SetTMSAction(int iPad, eTMSAction action) { m_eTMSAction[iPad] = action; }
 	eTMSAction      GetTMSAction(int iPad)																								{return m_eTMSAction[iPad];}
 	eXuiServerAction GetXuiServerAction(int iPad)																						{return m_eXuiServerAction[iPad];}
 	LPVOID			GetXuiServerActionParam(int iPad)																					{return m_eXuiServerActionParam[iPad];}
-	void			SetXuiServerAction(int iPad, eXuiServerAction action, LPVOID param = NULL)											{m_eXuiServerAction[iPad]=action; m_eXuiServerActionParam[iPad] = param;}
+	void			SetXuiServerAction(int iPad, eXuiServerAction action, LPVOID param = nullptr)											{m_eXuiServerAction[iPad]=action; m_eXuiServerActionParam[iPad] = param;}
 	eXuiServerAction GetGlobalXuiServerAction()																							{return m_eGlobalXuiServerAction;}
 	void			SetGlobalXuiServerAction(eXuiServerAction action)																			{m_eGlobalXuiServerAction=action;}
 
@@ -282,7 +282,7 @@ public:
 	void			SetGameSettingsDebugMask(int iPad, unsigned int uiVal);
 	void			ActionDebugMask(int iPad, bool bSetAllClear=false);
 
-	// 
+	//
 	bool IsLocalMultiplayerAvailable();
 
 	// for sign in change monitoring
@@ -359,7 +359,7 @@ public:
 
 	// Texture Pack Data files (icon, banner, comparison shot & text)
 	void AddMemoryTPDFile(int iConfig,PBYTE pbData,DWORD dwBytes);
-	void RemoveMemoryTPDFile(int iConfig);	
+	void RemoveMemoryTPDFile(int iConfig);
 	bool IsFileInTPD(int iConfig);
 	void GetTPD(int iConfig,PBYTE *ppbData,DWORD *pdwBytes);
 	int GetTPDSize() {return m_MEM_TPD.size();}
@@ -444,7 +444,7 @@ private:
 	static int BannedLevelDialogReturned(void *pParam,int iPad,const C4JStorage::EMessageResult);
 	static int TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
 
-	VBANNEDLIST *m_vBannedListA[XUSER_MAX_COUNT]; 
+	VBANNEDLIST *m_vBannedListA[XUSER_MAX_COUNT];
 
 	void HandleButtonPresses(int iPad);
 
@@ -472,7 +472,7 @@ private:
 
 	static unsigned int m_uiLastSignInData;
 
-	// We've got sizeof(GAME_SETTINGS) bytes reserved at the start of the gamedefined data per player for settings 
+	// We've got sizeof(GAME_SETTINGS) bytes reserved at the start of the gamedefined data per player for settings
 	GAME_SETTINGS *GameSettingsA[XUSER_MAX_COUNT];
 
 	// For promo work
@@ -517,7 +517,7 @@ private:
 	eXuiAction m_eXuiAction[XUSER_MAX_COUNT];
 	eTMSAction m_eTMSAction[XUSER_MAX_COUNT];
 	LPVOID m_eXuiActionParam[XUSER_MAX_COUNT];
-	eXuiAction m_eGlobalXuiAction;	
+	eXuiAction m_eGlobalXuiAction;
 	eXuiServerAction m_eXuiServerAction[XUSER_MAX_COUNT];
 	LPVOID m_eXuiServerActionParam[XUSER_MAX_COUNT];
 	eXuiServerAction m_eGlobalXuiServerAction;
@@ -541,20 +541,20 @@ private:
 	// Trial timer
 	float m_fTrialTimerStart,mfTrialPausedTime;
 	typedef struct TimeInfo
-	{    
-		LARGE_INTEGER qwTime;    
-		LARGE_INTEGER qwAppTime;   
+	{
+		LARGE_INTEGER qwTime;
+		LARGE_INTEGER qwAppTime;
 
-		float fAppTime;    
-		float fElapsedTime;    
-		float fSecsPerTick;    
-	} TIMEINFO;	
+		float fAppTime;
+		float fElapsedTime;
+		float fSecsPerTick;
+	} TIMEINFO;
 
 	TimeInfo m_Time;
 
 protected:
-	static const int MAX_TIPS_GAMETIP = 50; 
-	static const int MAX_TIPS_TRIVIATIP = 20; 
+	static const int MAX_TIPS_GAMETIP = 50;
+	static const int MAX_TIPS_TRIVIATIP = 20;
 	static TIPSTRUCT m_GameTipA[MAX_TIPS_GAMETIP];
 	static TIPSTRUCT m_TriviaTipA[MAX_TIPS_TRIVIATIP];
 	static Random *TipRandom;
@@ -606,7 +606,7 @@ public:
 	DLC_INFO *GetDLCInfoForFullOfferID(WCHAR *pwchProductId);
 	DLC_INFO *GetDLCInfoForProductName(WCHAR *pwchProductName);
 #else
-	static HRESULT RegisterDLCData(WCHAR *, WCHAR *, int, __uint64, __uint64, WCHAR *, unsigned int, int, WCHAR *pDataFile);
+	static HRESULT RegisterDLCData(WCHAR *, WCHAR *, int, uint64_t, uint64_t, WCHAR *, unsigned int, int, WCHAR *pDataFile);
 	bool GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal);
 	DLC_INFO *GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial);
 	DLC_INFO *GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full);
@@ -625,7 +625,7 @@ public:
 	virtual void ReleaseSaveThumbnail()=0;
 	virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize)=0;
 
-	virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false)=0;
+	virtual void ReadBannedList(int iPad, eTMSAction action=static_cast<eTMSAction>(0), bool bCallback=false)=0;
 
 private:
 
@@ -634,7 +634,7 @@ private:
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
 	static unordered_map<int, char * >  DLCTextures_PackID; // for mash-up packs & texture packs
-	static unordered_map<string,DLC_INFO * > DLCInfo; 
+	static unordered_map<string,DLC_INFO * > DLCInfo;
 	static unordered_map<wstring, ULONGLONG >  DLCInfo_SkinName; // skin name, full offer id
 #elif defined(_DURANGO)
 	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
@@ -729,7 +729,7 @@ public:
 
 	// World seed from png image
 	void GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,DWORD &uiTexturePack);
-	unsigned int CreateImageTextData(PBYTE bTextMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId);
+	unsigned int CreateImageTextData(PBYTE bTextMetadata, int64_t seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId);
 
 	// Game rules
 	GameRuleManager m_gameRules;
@@ -773,7 +773,7 @@ public:
 	unsigned int	AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote=false);
 	int				GetDLCInfoTexturesOffersCount();
 #if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-	DLC_INFO *GetDLCInfo(int iIndex);	
+	DLC_INFO *GetDLCInfo(int iIndex);
 	DLC_INFO *GetDLCInfo(char *);
 	DLC_INFO *GetDLCInfoFromTPackID(int iTPID);
 	bool GetDLCNameForPackID(const int iPackID,char **ppchKeyID);
@@ -862,12 +862,12 @@ public:
 
 	bool GetBanListRead(int iPad) { return m_bRead_BannedListA[iPad];}
 	void SetBanListRead(int iPad,bool bVal) { m_bRead_BannedListA[iPad]=bVal;}
-	void ClearBanList(int iPad) { BannedListA[iPad].pBannedList=NULL;BannedListA[iPad].dwBytes=0;}
+	void ClearBanList(int iPad) { BannedListA[iPad].pBannedList=nullptr;BannedListA[iPad].dwBytes=0;}
 
 	DWORD GetRequiredTexturePackID()	{return m_dwRequiredTexturePackID;}
 	void SetRequiredTexturePackID(DWORD dwID)	{m_dwRequiredTexturePackID=dwID;}
 
-	virtual void GetFileFromTPD(eTPDFileType eType,PBYTE pbData,DWORD dwBytes,PBYTE *ppbData,DWORD *pdwBytes ) {*ppbData = NULL; *pdwBytes = 0;}
+	virtual void GetFileFromTPD(eTPDFileType eType,PBYTE pbData,DWORD dwBytes,PBYTE *ppbData,DWORD *pdwBytes ) {*ppbData = nullptr; *pdwBytes = 0;}
 
 	//XTITLE_DEPLOYMENT_TYPE getDeploymentType() { return m_titleDeploymentType; }
 
@@ -935,5 +935,5 @@ private:
 #endif
 };
 
-//singleton 
+//singleton
 //extern CMinecraftApp app;
diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
index 6faf0c3b..ee0cb7a7 100644
--- a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
@@ -8,7 +8,7 @@
 
 DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)
 {	
-	m_pbData = NULL;
+	m_pbData = nullptr;
 	m_dwBytes = 0;
 }
 
@@ -26,7 +26,7 @@ PBYTE DLCAudioFile::getData(DWORD &dwBytes)
 	return m_pbData;
 }
 
-WCHAR *DLCAudioFile::wchTypeNamesA[]=
+const WCHAR *DLCAudioFile::wchTypeNamesA[]=
 {
 	L"CUENAME",
 	L"CREDIT",
@@ -40,7 +40,7 @@ DLCAudioFile::EAudioParameterType DLCAudioFile::getParameterType(const wstring &
 	{
 		if(paramName.compare(wchTypeNamesA[i]) == 0)
 		{
-			type = (EAudioParameterType)i;
+			type = static_cast<EAudioParameterType>(i);
 			break;
 		}
 	}
@@ -87,7 +87,7 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, cons
 					{
 						i++;
 					}
-					int iLast=(int)creditValue.find_last_of(L" ",i);
+					size_t iLast=creditValue.find_last_of(L" ", i);
 					switch(XGetLanguage())
 					{
 					case XC_LANGUAGE_JAPANESE:
@@ -96,7 +96,7 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, cons
 						iLast = maximumChars;
 						break;
 					default:
-						iLast=(int)creditValue.find_last_of(L" ",i);
+						iLast=creditValue.find_last_of(L" ", i);
 						break;
 					}
 
@@ -133,7 +133,7 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength)
 
 	if(uiVersion < CURRENT_AUDIO_VERSION_NUM)
 	{
-		if(pbData!=NULL) delete [] pbData;
+		if(pbData!=nullptr) delete [] pbData;
 		app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);
 		return false;
 	}
@@ -145,7 +145,7 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength)
 	for(unsigned int i=0;i<uiParameterTypeCount;i++)
 	{
 		// Map DLC strings to application strings, then store the DLC index mapping to application index
-		wstring parameterName((WCHAR *)pParams->wchData);
+		wstring parameterName(static_cast<WCHAR *>(pParams->wchData));
 		EAudioParameterType type = getParameterType(parameterName);
 		if( type != e_AudioParamType_Invalid )
 		{
@@ -169,7 +169,7 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength)
 
 	for(unsigned int i=0;i<uiFileCount;i++)
 	{
-		EAudioType type = (EAudioType)pFile->dwType;
+		EAudioType type = static_cast<EAudioType>(pFile->dwType);
 		// Params
 		unsigned int uiParameterCount=*(unsigned int *)pbTemp;
 		pbTemp+=sizeof(int);
@@ -182,7 +182,7 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength)
 
 			if(it != parameterMapping.end() )
 			{
- 				addParameter(type,(EAudioParameterType)pParams->dwType,(WCHAR *)pParams->wchData);
+ 				addParameter(type,static_cast<EAudioParameterType>(pParams->dwType),(WCHAR *)pParams->wchData);
 			}
 			pbTemp+=sizeof(C4JStorage::DLC_FILE_PARAM)+(sizeof(WCHAR)*pParams->dwWchCount);
 			pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp;
@@ -198,7 +198,7 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength)
 	return true;
 }
 
-int DLCAudioFile::GetCountofType(DLCAudioFile::EAudioType eType)
+int DLCAudioFile::GetCountofType(EAudioType eType)
 {
 	return m_parameters[eType].size();
 }
diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.h b/Minecraft.Client/Common/DLC/DLCAudioFile.h
index 728512d7..50131785 100644
--- a/Minecraft.Client/Common/DLC/DLCAudioFile.h
+++ b/Minecraft.Client/Common/DLC/DLCAudioFile.h
@@ -28,15 +28,15 @@ public:
 		e_AudioParamType_Max,
 
 	};
-	static WCHAR *wchTypeNamesA[e_AudioParamType_Max];
+	static const WCHAR *wchTypeNamesA[e_AudioParamType_Max];
 
 	DLCAudioFile(const wstring &path);
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
-	virtual PBYTE getData(DWORD &dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
+    PBYTE getData(DWORD &dwBytes) override;
 
 	bool processDLCDataFile(PBYTE pbData, DWORD dwLength);
-	int GetCountofType(DLCAudioFile::EAudioType ptype);
+	int GetCountofType(EAudioType ptype);
 	wstring &GetSoundName(int iIndex);
 
 private:
@@ -49,6 +49,6 @@ private:
 	vector<wstring> m_parameters[e_AudioType_Max];
 
 	// use the EAudioType to order these
-	void addParameter(DLCAudioFile::EAudioType type, DLCAudioFile::EAudioParameterType ptype, const wstring &value);
-	DLCAudioFile::EAudioParameterType getParameterType(const wstring &paramName);
+	void addParameter(EAudioType type, EAudioParameterType ptype, const wstring &value);
+	EAudioParameterType getParameterType(const wstring &paramName);
 };
diff --git a/Minecraft.Client/Common/DLC/DLCCapeFile.h b/Minecraft.Client/Common/DLC/DLCCapeFile.h
index 8373d340..9e9466c6 100644
--- a/Minecraft.Client/Common/DLC/DLCCapeFile.h
+++ b/Minecraft.Client/Common/DLC/DLCCapeFile.h
@@ -6,5 +6,5 @@ class DLCCapeFile : public DLCFile
 public:
 	DLCCapeFile(const wstring &path);
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
index ec800dac..a0c818a7 100644
--- a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
@@ -7,12 +7,12 @@
 
 DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
 {	
-	m_colourTable = NULL;
+	m_colourTable = nullptr;
 }
 
 DLCColourTableFile::~DLCColourTableFile()
 {
-	if(m_colourTable != NULL)
+	if(m_colourTable != nullptr)
 	{
 		app.DebugPrintf("Deleting DLCColourTableFile data\n");
 		delete m_colourTable;
diff --git a/Minecraft.Client/Common/DLC/DLCColourTableFile.h b/Minecraft.Client/Common/DLC/DLCColourTableFile.h
index 84269739..ded6f515 100644
--- a/Minecraft.Client/Common/DLC/DLCColourTableFile.h
+++ b/Minecraft.Client/Common/DLC/DLCColourTableFile.h
@@ -10,9 +10,9 @@ private:
 
 public:
 	DLCColourTableFile(const wstring &path);
-	~DLCColourTableFile();
+	~DLCColourTableFile() override;
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
 
-	ColourTable *getColourTable() { return m_colourTable; }
+	ColourTable *getColourTable() const { return m_colourTable; }
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCFile.h b/Minecraft.Client/Common/DLC/DLCFile.h
index 3a40dbc7..31b638ef 100644
--- a/Minecraft.Client/Common/DLC/DLCFile.h
+++ b/Minecraft.Client/Common/DLC/DLCFile.h
@@ -12,12 +12,12 @@ public:
 	DLCFile(DLCManager::EDLCType type, const wstring &path);
 	virtual ~DLCFile() {}
 
-	DLCManager::EDLCType getType()	{ return m_type; }
+	DLCManager::EDLCType getType() const { return m_type; }
 	wstring getPath()				{ return m_path; }
-	DWORD getSkinID()				{ return m_dwSkinId; }
+	DWORD getSkinID() const { return m_dwSkinId; }
 
 	virtual void addData(PBYTE pbData, DWORD dwBytes) {}
-	virtual PBYTE getData(DWORD &dwBytes) { dwBytes = 0; return NULL; }
+	virtual PBYTE getData(DWORD &dwBytes) { dwBytes = 0; return nullptr; }
 	virtual void addParameter(DLCManager::EDLCParameterType type, const wstring &value) {}
 
 	virtual wstring getParameterAsString(DLCManager::EDLCParameterType type) { return L""; }
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesFile.cpp b/Minecraft.Client/Common/DLC/DLCGameRulesFile.cpp
index 8ca520d6..d84e2a60 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRulesFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesFile.cpp
@@ -4,7 +4,7 @@
 
 DLCGameRulesFile::DLCGameRulesFile(const wstring &path) : DLCGameRules(DLCManager::e_DLCType_GameRules,path)
 {	
-	m_pbData = NULL;
+	m_pbData = nullptr;
 	m_dwBytes = 0;
 }
 
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesFile.h b/Minecraft.Client/Common/DLC/DLCGameRulesFile.h
index e6456d73..671cab6a 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRulesFile.h
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesFile.h
@@ -10,6 +10,6 @@ private:
 public:
 	DLCGameRulesFile(const wstring &path);
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
-	virtual PBYTE getData(DWORD &dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
+    PBYTE getData(DWORD &dwBytes) override;
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
index 39b85219..2b785998 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
@@ -11,14 +11,14 @@
 
 DLCGameRulesHeader::DLCGameRulesHeader(const wstring &path) : DLCGameRules(DLCManager::e_DLCType_GameRulesHeader,path)
 {	
-	m_pbData = NULL;
+	m_pbData = nullptr;
 	m_dwBytes = 0;
 
 	m_hasData = false;
 
 	m_grfPath = path.substr(0, path.length() - 4) + L".grf";
 
-	lgo = NULL;
+	lgo = nullptr;
 }
 
 void DLCGameRulesHeader::addData(PBYTE pbData, DWORD dwBytes)
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
index 4521ae11..7409540d 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
@@ -14,29 +14,52 @@ private:
 	bool m_hasData;
 
 public:
-	virtual bool requiresTexturePack() {return m_bRequiresTexturePack;}
-	virtual UINT getRequiredTexturePackId() {return m_requiredTexturePackId;}
-	virtual wstring getDefaultSaveName() {return m_defaultSaveName;}
-	virtual LPCWSTR getWorldName() {return m_worldName.c_str();}
-	virtual LPCWSTR getDisplayName() {return m_displayName.c_str();}
-	virtual wstring getGrfPath() {return L"GameRules.grf";}
-
-	virtual void setRequiresTexturePack(bool x) {m_bRequiresTexturePack = x;}
-	virtual void setRequiredTexturePackId(UINT x) {m_requiredTexturePackId = x;}
-	virtual void setDefaultSaveName(const wstring &x) {m_defaultSaveName = x;}
-	virtual void setWorldName(const wstring & x) {m_worldName = x;}
-	virtual void setDisplayName(const wstring & x) {m_displayName = x;}
-	virtual void setGrfPath(const wstring & x) {m_grfPath = x;}
+    bool requiresTexturePack() override
+    {return m_bRequiresTexturePack;}
+
+    UINT getRequiredTexturePackId() override
+    {return m_requiredTexturePackId;}
+
+    wstring getDefaultSaveName() override
+    {return m_defaultSaveName;}
+
+    LPCWSTR getWorldName() override
+    {return m_worldName.c_str();}
+
+    LPCWSTR getDisplayName() override
+    {return m_displayName.c_str();}
+
+    wstring getGrfPath() override
+    {return L"GameRules.grf";}
+
+    void setRequiresTexturePack(bool x) override
+    {m_bRequiresTexturePack = x;}
+
+    void setRequiredTexturePackId(UINT x) override
+    {m_requiredTexturePackId = x;}
+
+    void setDefaultSaveName(const wstring &x) override
+    {m_defaultSaveName = x;}
+
+    void setWorldName(const wstring & x) override
+    {m_worldName = x;}
+
+    void setDisplayName(const wstring & x) override
+    {m_displayName = x;}
+
+    void setGrfPath(const wstring & x) override
+    {m_grfPath = x;}
 
 	LevelGenerationOptions *lgo;
 
 public:
 	DLCGameRulesHeader(const wstring &path);
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
-	virtual PBYTE getData(DWORD &dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
+    PBYTE getData(DWORD &dwBytes) override;
 
 	void setGrfData(PBYTE fData, DWORD fSize, StringTable *);
 
-	virtual bool ready() { return m_hasData; }
+    bool ready() override
+    { return m_hasData; }
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
index 358a93e5..90921434 100644
--- a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
@@ -5,7 +5,7 @@
 
 DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
 {	
-	m_strings = NULL;
+	m_strings = nullptr;
 }
 
 void DLCLocalisationFile::addData(PBYTE pbData, DWORD dwBytes)
diff --git a/Minecraft.Client/Common/DLC/DLCLocalisationFile.h b/Minecraft.Client/Common/DLC/DLCLocalisationFile.h
index 083e60d8..419d714d 100644
--- a/Minecraft.Client/Common/DLC/DLCLocalisationFile.h
+++ b/Minecraft.Client/Common/DLC/DLCLocalisationFile.h
@@ -12,7 +12,7 @@ public:
 	DLCLocalisationFile(const wstring &path);
 	DLCLocalisationFile(PBYTE pbData, DWORD dwBytes); // when we load in a texture pack details file from TMS++
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
 
 	StringTable *getStringTable() { return m_strings; }
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp
index 36f4d7f7..931b0e1d 100644
--- a/Minecraft.Client/Common/DLC/DLCManager.cpp
+++ b/Minecraft.Client/Common/DLC/DLCManager.cpp
@@ -6,8 +6,9 @@
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\Minecraft.h"
 #include "..\..\TexturePackRepository.h"
+#include "Common/UI/UI.h"
 
-WCHAR *DLCManager::wchTypeNamesA[]=
+const WCHAR *DLCManager::wchTypeNamesA[]=
 {
 	L"DISPLAYNAME",
 	L"THEMENAME",
@@ -47,7 +48,7 @@ DLCManager::EDLCParameterType DLCManager::getParameterType(const wstring &paramN
 	{
 		if(paramName.compare(wchTypeNamesA[i]) == 0)
 		{
-			type = (EDLCParameterType)i;
+			type = static_cast<EDLCParameterType>(i);
 			break;
 		}
 	}
@@ -70,7 +71,7 @@ DWORD DLCManager::getPackCount(EDLCType type /*= e_DLCType_All*/)
 	}
 	else
 	{
-		packCount = (DWORD)m_packs.size();
+		packCount = static_cast<DWORD>(m_packs.size());
 	}
 	return packCount;
 }
@@ -82,7 +83,7 @@ void DLCManager::addPack(DLCPack *pack)
 
 void DLCManager::removePack(DLCPack *pack)
 {
-	if(pack != NULL)
+	if(pack != nullptr)
 	{
 		auto it = find(m_packs.begin(), m_packs.end(), pack);
 		if(it != m_packs.end() ) m_packs.erase(it);
@@ -112,7 +113,7 @@ void DLCManager::LanguageChanged(void)
 
 DLCPack *DLCManager::getPack(const wstring &name)
 {
-	DLCPack *pack = NULL;
+	DLCPack *pack = nullptr;
 	//DWORD currentIndex = 0;
 	for( DLCPack * currentPack : m_packs )
 	{
@@ -130,7 +131,7 @@ DLCPack *DLCManager::getPack(const wstring &name)
 #ifdef _XBOX_ONE
 DLCPack *DLCManager::getPackFromProductID(const wstring &productID)
 {
-	DLCPack *pack = NULL;
+	DLCPack *pack = nullptr;
 	for( DLCPack *currentPack : m_packs )
 	{
 		wstring wsName=currentPack->getPurchaseOfferId();
@@ -147,7 +148,7 @@ DLCPack *DLCManager::getPackFromProductID(const wstring &productID)
 
 DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/)
 {
-	DLCPack *pack = NULL;
+	DLCPack *pack = nullptr;
 	if( type != e_DLCType_All )
 	{
 		DWORD currentIndex = 0;
@@ -181,9 +182,9 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D
 {
 	DWORD foundIndex = 0;
 	found = false;
-	if(pack == NULL)
+	if(pack == nullptr)
 	{
-		app.DebugPrintf("DLCManager: Attempting to find the index for a NULL pack\n");
+		app.DebugPrintf("DLCManager: Attempting to find the index for a nullptr pack\n");
 		//__debugbreak();
 		return foundIndex;
 	}
@@ -244,7 +245,7 @@ DWORD DLCManager::getPackIndexContainingSkin(const wstring &path, bool &found)
 
 DLCPack *DLCManager::getPackContainingSkin(const wstring &path)
 {
-	DLCPack *foundPack = NULL;
+	DLCPack *foundPack = nullptr;
 	for( DLCPack *pack : m_packs )
 	{
 		if(pack->getDLCItemsCount(e_DLCType_Skin)>0)
@@ -261,11 +262,11 @@ DLCPack *DLCManager::getPackContainingSkin(const wstring &path)
 
 DLCSkinFile *DLCManager::getSkinFile(const wstring &path)
 {
-	DLCSkinFile *foundSkinfile = NULL;
+	DLCSkinFile *foundSkinfile = nullptr;
 	for( DLCPack *pack : m_packs )
 	{
 		foundSkinfile=pack->getSkinFile(path);
-		if(foundSkinfile!=NULL)
+		if(foundSkinfile!=nullptr)
 		{
 			break;
 		}
@@ -276,14 +277,14 @@ DLCSkinFile *DLCManager::getSkinFile(const wstring &path)
 DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/)
 {
 	DWORD corruptDLCCount = m_dwUnnamedCorruptDLCCount;	
-	DLCPack *firstCorruptPack = NULL;
+	DLCPack *firstCorruptPack = nullptr;
 
 	for( DLCPack *pack : m_packs )
 	{
 		if( pack->IsCorrupt() )
 		{
 			++corruptDLCCount;
-			if(firstCorruptPack == NULL) firstCorruptPack = pack;
+			if(firstCorruptPack == nullptr) firstCorruptPack = pack;
 		}
 	}
 
@@ -291,13 +292,13 @@ DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/)
 	{
 		UINT uiIDA[1];
 		uiIDA[0]=IDS_CONFIRM_OK;
-		if(corruptDLCCount == 1 && firstCorruptPack != NULL)
+		if(corruptDLCCount == 1 && firstCorruptPack != nullptr)
 		{
 			// pass in the pack format string
 			WCHAR wchFormat[132];
 			swprintf(wchFormat, 132, L"%ls\n\n%%ls", firstCorruptPack->getName().c_str());
 
-			C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL,wchFormat);
+			C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr,wchFormat);
 
 		}
 		else
@@ -330,13 +331,13 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL
 #ifdef _WINDOWS64
 	string finalPath = StorageManager.GetMountedPath(path.c_str());
 	if(finalPath.size() == 0) finalPath = path;
-	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #elif defined(_DURANGO)
 	wstring finalPath = StorageManager.GetMountedPath(wPath.c_str());
 	if(finalPath.size() == 0) finalPath = wPath;
-	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #else
-	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #endif
 	if( file == INVALID_HANDLE_VALUE )
 	{
@@ -347,9 +348,9 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL
 		return false;
 	}
 
-	DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
+	DWORD bytesRead,dwFileSize = GetFileSize(file,nullptr);
 	PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
-	BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
+	BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,nullptr);
 	if(bSuccess==FALSE)
 	{
 		// need to treat the file as corrupt, and flag it, so can't call fatal error
@@ -372,7 +373,7 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL
 
 bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD dwLength, DLCPack *pack)
 {
-	unordered_map<int, DLCManager::EDLCParameterType> parameterMapping;
+	unordered_map<int, EDLCParameterType> parameterMapping;
 	unsigned int uiCurrentByte=0;
 
 	// File format defined in the DLC_Creator
@@ -391,7 +392,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 
 	if(uiVersion < CURRENT_DLC_VERSION_NUM)
 	{
-		if(pbData!=NULL) delete [] pbData;
+		if(pbData!=nullptr) delete [] pbData;
 		app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);
 		return false;
 	}
@@ -403,9 +404,9 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 	for(unsigned int i=0;i<uiParameterCount;i++)
 	{
 		// Map DLC strings to application strings, then store the DLC index mapping to application index
-		wstring parameterName((WCHAR *)pParams->wchData);
-		DLCManager::EDLCParameterType type = DLCManager::getParameterType(parameterName);
-		if( type != DLCManager::e_DLCParamType_Invalid )
+		wstring parameterName(static_cast<WCHAR *>(pParams->wchData));
+		EDLCParameterType type = getParameterType(parameterName);
+		if( type != e_DLCParamType_Invalid )
 		{
 			parameterMapping[pParams->dwType] = type;
 		}
@@ -429,10 +430,10 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 
 	for(unsigned int i=0;i<uiFileCount;i++)
 	{
-		DLCManager::EDLCType type = (DLCManager::EDLCType)pFile->dwType;
+		EDLCType type = static_cast<EDLCType>(pFile->dwType);
 
-		DLCFile *dlcFile = NULL;
-		DLCPack *dlcTexturePack = NULL;
+		DLCFile *dlcFile = nullptr;
+		DLCPack *dlcTexturePack = nullptr;
 
 		if(type == e_DLCType_TexturePack)
 		{
@@ -461,8 +462,8 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 				}
 				else
 				{
-					if(dlcFile != NULL) dlcFile->addParameter(it->second,(WCHAR *)pParams->wchData);
-					else if(dlcTexturePack != NULL) dlcTexturePack->addParameter(it->second, (WCHAR *)pParams->wchData);
+					if(dlcFile != nullptr) dlcFile->addParameter(it->second,(WCHAR *)pParams->wchData);
+					else if(dlcTexturePack != nullptr) dlcTexturePack->addParameter(it->second, (WCHAR *)pParams->wchData);
 				}
 			}
 			pbTemp+=sizeof(C4JStorage::DLC_FILE_PARAM)+(sizeof(WCHAR)*pParams->dwWchCount);
@@ -470,28 +471,28 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 		}
 		//pbTemp+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM);
 
-		if(dlcTexturePack != NULL)
+		if(dlcTexturePack != nullptr)
 		{
 			DWORD texturePackFilesProcessed = 0;
 			bool validPack = processDLCDataFile(texturePackFilesProcessed,pbTemp,pFile->uiFileSize,dlcTexturePack);
-			pack->SetDataPointer(NULL); // If it's a child pack, it doesn't own the data
+			pack->SetDataPointer(nullptr); // If it's a child pack, it doesn't own the data
 			if(!validPack || texturePackFilesProcessed == 0)
 			{
 				delete dlcTexturePack;
-				dlcTexturePack = NULL;
+				dlcTexturePack = nullptr;
 			}
 			else
 			{
 				pack->addChildPack(dlcTexturePack);
 
-				if(dlcTexturePack->getDLCItemsCount(DLCManager::e_DLCType_Texture) > 0)
+				if(dlcTexturePack->getDLCItemsCount(e_DLCType_Texture) > 0)
 				{
 					Minecraft::GetInstance()->skins->addTexturePackFromDLC(dlcTexturePack, dlcTexturePack->GetPackId() );
 				}
 			}
 			++dwFilesProcessed;
 		}
-		else if(dlcFile != NULL)
+		else if(dlcFile != nullptr)
 		{
 			// Data
 			dlcFile->addData(pbTemp,pFile->uiFileSize);
@@ -499,7 +500,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 			// TODO - 4J Stu Remove the need for this vSkinNames vector, or manage it differently
 			switch(pFile->dwType)
 			{
-			case DLCManager::e_DLCType_Skin:
+			case e_DLCType_Skin:
 				app.vSkinNames.push_back((WCHAR *)pFile->wchFile);
 				break;
 			}
@@ -514,13 +515,13 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 		pFile=(C4JStorage::DLC_FILE_DETAILS *)&pbData[uiCurrentByte];
 	}
 
-	if( pack->getDLCItemsCount(DLCManager::e_DLCType_GameRules) > 0
-		|| pack->getDLCItemsCount(DLCManager::e_DLCType_GameRulesHeader) > 0)
+	if( pack->getDLCItemsCount(e_DLCType_GameRules) > 0
+		|| pack->getDLCItemsCount(e_DLCType_GameRulesHeader) > 0)
 	{
 		app.m_gameRules.loadGameRules(pack);
 	}
 
-	if(pack->getDLCItemsCount(DLCManager::e_DLCType_Audio) > 0)
+	if(pack->getDLCItemsCount(e_DLCType_Audio) > 0)
 	{
 		//app.m_Audio.loadAudioDetails(pack);
 	}
@@ -537,22 +538,22 @@ DWORD DLCManager::retrievePackIDFromDLCDataFile(const string &path, DLCPack *pac
 #ifdef _WINDOWS64
 	string finalPath = StorageManager.GetMountedPath(path.c_str());
 	if(finalPath.size() == 0) finalPath = path;
-	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #elif defined(_DURANGO)
 	wstring finalPath = StorageManager.GetMountedPath(wPath.c_str());
 	if(finalPath.size() == 0) finalPath = wPath;
-	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #else
-	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #endif
 	if( file == INVALID_HANDLE_VALUE )
 	{
 		return 0;
 	}
 
-	DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
+	DWORD bytesRead,dwFileSize = GetFileSize(file,nullptr);
 	PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
-	BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
+	BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,nullptr);
 	if(bSuccess==FALSE)
 	{
 		// need to treat the file as corrupt, and flag it, so can't call fatal error
@@ -579,7 +580,7 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
 {
 	DWORD packId=0;
 	bool bPackIDSet=false;
-	unordered_map<int, DLCManager::EDLCParameterType> parameterMapping;
+	unordered_map<int, EDLCParameterType> parameterMapping;
 	unsigned int uiCurrentByte=0;
 
 	// File format defined in the DLC_Creator
@@ -608,9 +609,9 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
 	for(unsigned int i=0;i<uiParameterCount;i++)
 	{
 		// Map DLC strings to application strings, then store the DLC index mapping to application index
-		wstring parameterName((WCHAR *)pParams->wchData);
-		DLCManager::EDLCParameterType type = DLCManager::getParameterType(parameterName);
-		if( type != DLCManager::e_DLCParamType_Invalid )
+		wstring parameterName(static_cast<WCHAR *>(pParams->wchData));
+		EDLCParameterType type = getParameterType(parameterName);
+		if( type != e_DLCParamType_Invalid )
 		{
 			parameterMapping[pParams->dwType] = type;
 		}
@@ -633,7 +634,7 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
 
 	for(unsigned int i=0;i<uiFileCount;i++)
 	{
-		DLCManager::EDLCType type = (DLCManager::EDLCType)pFile->dwType;
+		EDLCType type = static_cast<EDLCType>(pFile->dwType);
 
 		// Params
 		uiParameterCount=*(unsigned int *)pbTemp;
@@ -649,7 +650,7 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
 				{
 					if(it->second==e_DLCParamType_PackId)
 					{				
-						wstring wsTemp=(WCHAR *)pParams->wchData;
+						wstring wsTemp=static_cast<WCHAR *>(pParams->wchData);
 						std::wstringstream ss;
 						// 4J Stu - numbered using decimal to make it easier for artists/people to number manually
 						ss << std::dec << wsTemp.c_str();
diff --git a/Minecraft.Client/Common/DLC/DLCManager.h b/Minecraft.Client/Common/DLC/DLCManager.h
index 27765232..d4dd2508 100644
--- a/Minecraft.Client/Common/DLC/DLCManager.h
+++ b/Minecraft.Client/Common/DLC/DLCManager.h
@@ -48,7 +48,7 @@ public:
 		e_DLCParamType_Max,
 
 	};
-	static WCHAR *wchTypeNamesA[e_DLCParamType_Max];
+	static const WCHAR *wchTypeNamesA[e_DLCParamType_Max];
 
 private:
 	vector<DLCPack *> m_packs;
diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp
index ea8a270f..110008c6 100644
--- a/Minecraft.Client/Common/DLC/DLCPack.cpp
+++ b/Minecraft.Client/Common/DLC/DLCPack.cpp
@@ -24,14 +24,14 @@ DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
 	m_isCorrupt = false;
 	m_packId = 0;
 	m_packVersion = 0;
-	m_parentPack = NULL;
+	m_parentPack = nullptr;
 	m_dlcMountIndex = -1;
 #ifdef _XBOX
 	m_dlcDeviceID = XCONTENTDEVICE_ANY;
 #endif
 	
 	// This pointer is for all the data used for this pack, so deleting it invalidates ALL of it's children.
-	m_data = NULL;
+	m_data = nullptr;
 }
 
 #ifdef _XBOX_ONE
@@ -44,11 +44,11 @@ DLCPack::DLCPack(const wstring &name,const wstring &productID,DWORD dwLicenseMas
 	m_isCorrupt = false;
 	m_packId = 0;
 	m_packVersion = 0;
-	m_parentPack = NULL;
+	m_parentPack = nullptr;
 	m_dlcMountIndex = -1;
 
 	// This pointer is for all the data used for this pack, so deleting it invalidates ALL of it's children.
-	m_data = NULL;
+	m_data = nullptr;
 }
 #endif
 
@@ -76,7 +76,7 @@ DLCPack::~DLCPack()
 		wprintf(L"Deleting data for DLC pack %ls\n", m_packName.c_str());
 #endif
 		// For the same reason, don't delete data pointer for any child pack as it just points to a region within the parent pack that has already been freed
-		if( m_parentPack == NULL )
+		if( m_parentPack == nullptr )
 		{
 			delete [] m_data;
 		}
@@ -85,7 +85,7 @@ DLCPack::~DLCPack()
 
 DWORD DLCPack::GetDLCMountIndex()
 {
-	if(m_parentPack != NULL)
+	if(m_parentPack != nullptr)
 	{
 		return m_parentPack->GetDLCMountIndex();
 	}
@@ -94,7 +94,7 @@ DWORD DLCPack::GetDLCMountIndex()
 
 XCONTENTDEVICEID DLCPack::GetDLCDeviceID()
 {
-	if(m_parentPack != NULL )
+	if(m_parentPack != nullptr )
 	{
 		return m_parentPack->GetDLCDeviceID();
 	}
@@ -156,7 +156,7 @@ void DLCPack::addParameter(DLCManager::EDLCParameterType type, const wstring &va
 		m_dataPath = value;
 		break;
 	default:
-		m_parameters[(int)type] = value;
+		m_parameters[static_cast<int>(type)] = value;
 		break;
 	}
 }
@@ -187,7 +187,7 @@ bool DLCPack::getParameterAsUInt(DLCManager::EDLCParameterType type, unsigned in
 
 DLCFile *DLCPack::addFile(DLCManager::EDLCType type, const wstring &path)
 {
-	DLCFile *newFile = NULL;
+	DLCFile *newFile = nullptr;
 
 	switch(type)
 	{
@@ -243,7 +243,7 @@ DLCFile *DLCPack::addFile(DLCManager::EDLCType type, const wstring &path)
 		break;
 	};
 
-	if( newFile != NULL )
+	if( newFile != nullptr )
 	{
 		m_files[newFile->getType()].push_back(newFile);
 	}
@@ -252,7 +252,7 @@ DLCFile *DLCPack::addFile(DLCManager::EDLCType type, const wstring &path)
 }
 
 // MGH - added this comp func, as the embedded func in find_if was confusing the PS3 compiler
-static const wstring *g_pathCmpString = NULL;
+static const wstring *g_pathCmpString = nullptr;
 static bool pathCmp(DLCFile *val)
 {
 	return (g_pathCmpString->compare(val->getPath()) == 0); 
@@ -263,7 +263,7 @@ bool DLCPack::doesPackContainFile(DLCManager::EDLCType type, const wstring &path
 	bool hasFile = false;
 	if(type == DLCManager::e_DLCType_All)
 	{
-		for(DLCManager::EDLCType currentType = (DLCManager::EDLCType)0; currentType < DLCManager::e_DLCType_Max; currentType = (DLCManager::EDLCType)(currentType + 1))
+		for(DLCManager::EDLCType currentType = static_cast<DLCManager::EDLCType>(0); currentType < DLCManager::e_DLCType_Max; currentType = static_cast<DLCManager::EDLCType>(currentType + 1))
 		{
 			hasFile = doesPackContainFile(currentType,path);
 			if(hasFile) break;
@@ -284,13 +284,13 @@ bool DLCPack::doesPackContainFile(DLCManager::EDLCType type, const wstring &path
 
 DLCFile *DLCPack::getFile(DLCManager::EDLCType type, DWORD index)
 {
-	DLCFile *file = NULL;
+	DLCFile *file = nullptr;
 	if(type == DLCManager::e_DLCType_All)
 	{
-		for(DLCManager::EDLCType currentType = (DLCManager::EDLCType)0; currentType < DLCManager::e_DLCType_Max; currentType = (DLCManager::EDLCType)(currentType + 1))
+		for(DLCManager::EDLCType currentType = static_cast<DLCManager::EDLCType>(0); currentType < DLCManager::e_DLCType_Max; currentType = static_cast<DLCManager::EDLCType>(currentType + 1))
 		{
 			file = getFile(currentType,index);
-			if(file != NULL) break;
+			if(file != nullptr) break;
 		}
 	}
 	else
@@ -306,13 +306,13 @@ DLCFile *DLCPack::getFile(DLCManager::EDLCType type, DWORD index)
 
 DLCFile *DLCPack::getFile(DLCManager::EDLCType type, const wstring &path)
 {
-	DLCFile *file = NULL;
+	DLCFile *file = nullptr;
 	if(type == DLCManager::e_DLCType_All)
 	{
-		for(DLCManager::EDLCType currentType = (DLCManager::EDLCType)0; currentType < DLCManager::e_DLCType_Max; currentType = (DLCManager::EDLCType)(currentType + 1))
+		for(DLCManager::EDLCType currentType = static_cast<DLCManager::EDLCType>(0); currentType < DLCManager::e_DLCType_Max; currentType = static_cast<DLCManager::EDLCType>(currentType + 1))
 		{
 			file = getFile(currentType,path);
-			if(file != NULL) break;
+			if(file != nullptr) break;
 		}
 	}
 	else
@@ -323,7 +323,7 @@ DLCFile *DLCPack::getFile(DLCManager::EDLCType type, const wstring &path)
 		if(it == m_files[type].end())
 		{
 			// Not found
-			file = NULL; 
+			file = nullptr; 
 		}
 		else
 		{
@@ -346,11 +346,11 @@ DWORD DLCPack::getDLCItemsCount(DLCManager::EDLCType type /*= DLCManager::e_DLCT
 	case DLCManager::e_DLCType_All:
 		for(int i = 0; i < DLCManager::e_DLCType_Max; ++i)
 		{
-			count += getDLCItemsCount((DLCManager::EDLCType)i);
+			count += getDLCItemsCount(static_cast<DLCManager::EDLCType>(i));
 		}
 		break;
 	default:
-		count = (DWORD)m_files[(int)type].size();
+		count = static_cast<DWORD>(m_files[(int)type].size());
 		break;
 	};
 	return count;
@@ -420,12 +420,12 @@ void  DLCPack::UpdateLanguage()
 {
 	// find the language file
 	DLCManager::e_DLCType_LocalisationData;
-	DLCFile *file = NULL;
+	DLCFile *file = nullptr;
 
 	if(m_files[DLCManager::e_DLCType_LocalisationData].size() > 0)
 	{
 		file = m_files[DLCManager::e_DLCType_LocalisationData][0];
-		DLCLocalisationFile *localisationFile = (DLCLocalisationFile *)getFile(DLCManager::e_DLCType_LocalisationData, L"languages.loc");
+		DLCLocalisationFile *localisationFile = static_cast<DLCLocalisationFile *>(getFile(DLCManager::e_DLCType_LocalisationData, L"languages.loc"));
 		StringTable *strTable = localisationFile->getStringTable();
 		strTable->ReloadStringTable();
 	}
diff --git a/Minecraft.Client/Common/DLC/DLCPack.h b/Minecraft.Client/Common/DLC/DLCPack.h
index df1f65f0..14129cbe 100644
--- a/Minecraft.Client/Common/DLC/DLCPack.h
+++ b/Minecraft.Client/Common/DLC/DLCPack.h
@@ -87,8 +87,8 @@ public:
 	
 	DWORD getSkinCount() { return getDLCItemsCount(DLCManager::e_DLCType_Skin); }
 	DWORD getSkinIndexAt(const wstring &path, bool &found) { return getFileIndexAt(DLCManager::e_DLCType_Skin, path, found); }
-	DLCSkinFile *getSkinFile(const wstring &path) { return (DLCSkinFile *)getFile(DLCManager::e_DLCType_Skin, path); }
-	DLCSkinFile *getSkinFile(DWORD index) { return (DLCSkinFile *)getFile(DLCManager::e_DLCType_Skin, index); }
+	DLCSkinFile *getSkinFile(const wstring &path) { return static_cast<DLCSkinFile *>(getFile(DLCManager::e_DLCType_Skin, path)); }
+	DLCSkinFile *getSkinFile(DWORD index) { return static_cast<DLCSkinFile *>(getFile(DLCManager::e_DLCType_Skin, index)); }
 	bool doesPackContainSkin(const wstring &path) { return doesPackContainFile(DLCManager::e_DLCType_Skin, path); }
 
 	bool hasPurchasedFile(DLCManager::EDLCType type, const wstring &path);
diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
index c845acd9..f7ef2ad0 100644
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
@@ -79,7 +79,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
 				{
 					i++;
 				}
-				int iLast=(int)creditValue.find_last_of(L" ",i);
+				size_t iLast=creditValue.find_last_of(L" ", i);
 				switch(XGetLanguage())
 				{
 				case XC_LANGUAGE_JAPANESE:
@@ -88,7 +88,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
 					iLast = maximumChars;
 					break;
 				default:
-					iLast=(int)creditValue.find_last_of(L" ",i);
+					iLast=creditValue.find_last_of(L" ", i);
 					break;
 				}
 
@@ -178,7 +178,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
 
 int DLCSkinFile::getAdditionalBoxesCount()
 {
-	return (int)m_AdditionalBoxes.size();
+	return static_cast<int>(m_AdditionalBoxes.size());
 }
 vector<SKIN_BOX *> *DLCSkinFile::getAdditionalBoxes()
 {
diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.h b/Minecraft.Client/Common/DLC/DLCSkinFile.h
index c8dcf0e9..15a50e71 100644
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.h
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.h
@@ -17,11 +17,11 @@ public:
 
 	DLCSkinFile(const wstring &path);
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
-	virtual void addParameter(DLCManager::EDLCParameterType type, const wstring &value);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
+    void addParameter(DLCManager::EDLCParameterType type, const wstring &value) override;
 
-	virtual wstring getParameterAsString(DLCManager::EDLCParameterType type);
-	virtual bool getParameterAsBool(DLCManager::EDLCParameterType type);
+    wstring getParameterAsString(DLCManager::EDLCParameterType type) override;
+    bool getParameterAsBool(DLCManager::EDLCParameterType type) override;
 	vector<SKIN_BOX *> *getAdditionalBoxes();
 	int getAdditionalBoxesCount();
 	unsigned int getAnimOverrideBitmask() { return m_uiAnimOverrideBitmask;}
diff --git a/Minecraft.Client/Common/DLC/DLCTextureFile.cpp b/Minecraft.Client/Common/DLC/DLCTextureFile.cpp
index edf071c6..fb9c5b03 100644
--- a/Minecraft.Client/Common/DLC/DLCTextureFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCTextureFile.cpp
@@ -7,7 +7,7 @@ DLCTextureFile::DLCTextureFile(const wstring &path) : DLCFile(DLCManager::e_DLCT
 	m_bIsAnim = false;
 	m_animString = L"";
 	
-	m_pbData = NULL;
+	m_pbData = nullptr;
 	m_dwBytes = 0;
 }
 
diff --git a/Minecraft.Client/Common/DLC/DLCTextureFile.h b/Minecraft.Client/Common/DLC/DLCTextureFile.h
index bc791686..2b397e8e 100644
--- a/Minecraft.Client/Common/DLC/DLCTextureFile.h
+++ b/Minecraft.Client/Common/DLC/DLCTextureFile.h
@@ -14,11 +14,11 @@ private:
 public:
 	DLCTextureFile(const wstring &path);
 
-	virtual void addData(PBYTE pbData, DWORD dwBytes);
-	virtual PBYTE getData(DWORD &dwBytes);
+    void addData(PBYTE pbData, DWORD dwBytes) override;
+    PBYTE getData(DWORD &dwBytes) override;
 
-	virtual void addParameter(DLCManager::EDLCParameterType type, const wstring &value);
+    void addParameter(DLCManager::EDLCParameterType type, const wstring &value) override;
 
-	virtual wstring getParameterAsString(DLCManager::EDLCParameterType type);
-	virtual bool getParameterAsBool(DLCManager::EDLCParameterType type);
+    wstring getParameterAsString(DLCManager::EDLCParameterType type) override;
+    bool getParameterAsBool(DLCManager::EDLCParameterType type) override;
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCUIDataFile.cpp b/Minecraft.Client/Common/DLC/DLCUIDataFile.cpp
index a2a56bca..597c4b7b 100644
--- a/Minecraft.Client/Common/DLC/DLCUIDataFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCUIDataFile.cpp
@@ -4,14 +4,14 @@
 
 DLCUIDataFile::DLCUIDataFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_UIData,path)
 {	
-	m_pbData = NULL;
+	m_pbData = nullptr;
 	m_dwBytes = 0;
 	m_canDeleteData = false;
 }
 
 DLCUIDataFile::~DLCUIDataFile()
 {
-	if(m_canDeleteData && m_pbData != NULL)
+	if(m_canDeleteData && m_pbData != nullptr)
 	{
 		app.DebugPrintf("Deleting DLCUIDataFile data\n");
 		delete [] m_pbData;
diff --git a/Minecraft.Client/Common/DLC/DLCUIDataFile.h b/Minecraft.Client/Common/DLC/DLCUIDataFile.h
index 105ad0df..c858933c 100644
--- a/Minecraft.Client/Common/DLC/DLCUIDataFile.h
+++ b/Minecraft.Client/Common/DLC/DLCUIDataFile.h
@@ -10,11 +10,11 @@ private:
 
 public:
 	DLCUIDataFile(const wstring &path);
-	~DLCUIDataFile();
+	~DLCUIDataFile() override;
 
 	using DLCFile::addData;
 	using DLCFile::addParameter;
 
 	virtual void addData(PBYTE pbData, DWORD dwBytes,bool canDeleteData = false);
-	virtual PBYTE getData(DWORD &dwBytes);
+    PBYTE getData(DWORD &dwBytes) override;
 };
diff --git a/Minecraft.Client/Common/Filesystem/Filesystem.cpp b/Minecraft.Client/Common/Filesystem/Filesystem.cpp
deleted file mode 100644
index 0d225cb5..00000000
--- a/Minecraft.Client/Common/Filesystem/Filesystem.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "stdafx.h"
-#include "Filesystem.h"
-
-#ifdef _WINDOWS64
-#include <windows.h>
-#endif // TODO: More os' filesystem handling for when the project moves away from only Windows
-
-#include <stdio.h>
-
-bool FileOrDirectoryExists(const char* path)
-{
-#ifdef _WINDOWS64
-    DWORD attribs = GetFileAttributesA(path);
-    return (attribs != INVALID_FILE_ATTRIBUTES);
-#else
-    #error "FileOrDirectoryExists not implemented for this platform"
-    return false;
-#endif
-}
-
-bool FileExists(const char* path)
-{
-#ifdef _WINDOWS64
-    DWORD attribs = GetFileAttributesA(path);
-    return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
-#else
-    #error "FileExists not implemented for this platform"
-    return false;
-#endif
-}
-
-bool DirectoryExists(const char* path)
-{
-#ifdef _WINDOWS64
-    DWORD attribs = GetFileAttributesA(path);
-    return (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY));
-#else
-    #error "DirectoryExists not implemented for this platform"
-    return false;
-#endif
-}
-
-bool GetFirstFileInDirectory(const char* directory, char* outFilePath, size_t outFilePathSize)
-{
-#ifdef _WINDOWS64
-    char searchPath[MAX_PATH];
-    snprintf(searchPath, MAX_PATH, "%s\\*", directory);
-
-    WIN32_FIND_DATAA findData;
-    HANDLE hFind = FindFirstFileA(searchPath, &findData);
-
-    if (hFind == INVALID_HANDLE_VALUE)
-    {
-        return false;
-    }
-
-    do
-    {
-        if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-        {
-            // Found a file, copy its path to the output buffer
-            snprintf(outFilePath, outFilePathSize, "%s\\%s", directory, findData.cFileName);
-            FindClose(hFind);
-            return true;
-        }
-    } while (FindNextFileA(hFind, &findData) != 0);
-
-    FindClose(hFind);
-    return false; // No files found in the directory
-#else
-    #error "GetFirstFileInDirectory not implemented for this platform"
-    return false;
-#endif
-}
diff --git a/Minecraft.Client/Common/Filesystem/Filesystem.h b/Minecraft.Client/Common/Filesystem/Filesystem.h
deleted file mode 100644
index 11d1bf5b..00000000
--- a/Minecraft.Client/Common/Filesystem/Filesystem.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-bool FileOrDirectoryExists(const char* path);
-bool FileExists(const char* path);
-bool DirectoryExists(const char* path);
-bool GetFirstFileInDirectory(const char* directory, char* outFilePath, size_t outFilePathSize);
diff --git a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
index 555ed8b4..f97bfdd1 100644
--- a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
@@ -46,7 +46,7 @@ void AddEnchantmentRuleDefinition::addAttribute(const wstring &attributeName, co
 bool AddEnchantmentRuleDefinition::enchantItem(shared_ptr<ItemInstance> item)
 {
 	bool enchanted = false;
-	if (item != NULL)
+	if (item != nullptr)
 	{
 		// 4J-JEV: Ripped code from enchantmenthelpers
 		// Maybe we want to add an addEnchantment method to EnchantmentHelpers
@@ -58,7 +58,7 @@ bool AddEnchantmentRuleDefinition::enchantItem(shared_ptr<ItemInstance> item)
 		{
 			Enchantment *e = Enchantment::enchantments[m_enchantmentId];
 
-			if(e != NULL && e->category->canEnchant(item->getItem()))
+			if(e != nullptr && e->category->canEnchant(item->getItem()))
 			{
 				int level = min(e->getMaxLevel(), m_enchantmentLevel);
 				item->enchant(e, m_enchantmentLevel);
diff --git a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
index 801a2937..49809d0c 100644
--- a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
@@ -41,11 +41,11 @@ void AddItemRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
 
 GameRuleDefinition *AddItemRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_AddEnchantment)
 	{
 		rule = new AddEnchantmentRuleDefinition();
-		m_enchantments.push_back((AddEnchantmentRuleDefinition *)rule);
+		m_enchantments.push_back(static_cast<AddEnchantmentRuleDefinition *>(rule));
 	}
 	else
 	{
@@ -97,10 +97,10 @@ void AddItemRuleDefinition::addAttribute(const wstring &attributeName, const wst
 bool AddItemRuleDefinition::addItemToContainer(shared_ptr<Container> container, int slotId)
 {
 	bool added = false;
-	if(Item::items[m_itemId] != NULL)
+	if(Item::items[m_itemId] != nullptr)
 	{
 		int quantity = std::min<int>(m_quantity, Item::items[m_itemId]->getMaxStackSize());
-		shared_ptr<ItemInstance> newItem = shared_ptr<ItemInstance>(new ItemInstance(m_itemId,quantity,m_auxValue) );
+		shared_ptr<ItemInstance> newItem = std::make_shared<ItemInstance>(m_itemId, quantity, m_auxValue);
 		newItem->set4JData(m_dataTag);
 
 		for( auto& it : m_enchantments )
@@ -118,7 +118,7 @@ bool AddItemRuleDefinition::addItemToContainer(shared_ptr<Container> container,
 			container->setItem( slotId, newItem );
 			added = true;
 		}
-		else if(dynamic_pointer_cast<Inventory>(container) != NULL)
+		else if(dynamic_pointer_cast<Inventory>(container) != nullptr)
 		{
 			added = dynamic_pointer_cast<Inventory>(container)->add(newItem);
 		}
diff --git a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
index a740a2be..3c7e02a3 100644
--- a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
@@ -13,20 +13,20 @@ ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(LevelGenerationOption
 {
 	m_levelGenOptions = levelGenOptions;
 	m_location = Vec3::newPermanent(0,0,0);
-	m_locationBox = NULL;
+	m_locationBox = nullptr;
 	m_totalBlocksChanged = 0;
 	m_totalBlocksChangedLighting = 0;
 	m_rotation = ConsoleSchematicFile::eSchematicRot_0;
 	m_completed = false;
 	m_dimension = 0;
-	m_schematic = NULL;
+	m_schematic = nullptr;
 }
 
 ApplySchematicRuleDefinition::~ApplySchematicRuleDefinition()
 {
 	app.DebugPrintf("Deleting ApplySchematicRuleDefinition.\n");
 	if(!m_completed) m_levelGenOptions->releaseSchematicFile(m_schematicName);
-	m_schematic = NULL;
+	m_schematic = nullptr;
 	delete m_location;
 }
 
@@ -72,20 +72,20 @@ void ApplySchematicRuleDefinition::addAttribute(const wstring &attributeName, co
 	else if(attributeName.compare(L"x") == 0)
 	{
 		m_location->x = _fromString<int>(attributeValue);
-		if( ((int)abs(m_location->x))%2 != 0) m_location->x -=1;
+		if( static_cast<int>(abs(m_location->x))%2 != 0) m_location->x -=1;
 		//app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter x=%f\n",m_location->x);
 	}
 	else if(attributeName.compare(L"y") == 0)
 	{
 		m_location->y = _fromString<int>(attributeValue);
-		if( ((int)abs(m_location->y))%2 != 0) m_location->y -= 1;
+		if( static_cast<int>(abs(m_location->y))%2 != 0) m_location->y -= 1;
 		if(m_location->y < 0) m_location->y = 0;
 		//app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter y=%f\n",m_location->y);
 	}
 	else if(attributeName.compare(L"z") == 0)
 	{
 		m_location->z = _fromString<int>(attributeValue);
-		if(((int)abs(m_location->z))%2 != 0) m_location->z -= 1;
+		if(static_cast<int>(abs(m_location->z))%2 != 0) m_location->z -= 1;
 		//app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter z=%f\n",m_location->z);
 	}
 	else if(attributeName.compare(L"rot") == 0)
@@ -95,7 +95,7 @@ void ApplySchematicRuleDefinition::addAttribute(const wstring &attributeName, co
 		while(degrees < 0) degrees += 360;
 		while(degrees >= 360) degrees -= 360;
 		float quad = degrees/90;
-		degrees = (int)(quad + 0.5f);
+		degrees = static_cast<int>(quad + 0.5f);
 		switch(degrees)
 		{
 		case 1:
@@ -130,7 +130,7 @@ void ApplySchematicRuleDefinition::addAttribute(const wstring &attributeName, co
 
 void ApplySchematicRuleDefinition::updateLocationBox()
 {
-	if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
+	if(m_schematic == nullptr) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
 
 	m_locationBox = AABB::newPermanent(0,0,0,0,0,0);
 
@@ -162,9 +162,9 @@ void ApplySchematicRuleDefinition::processSchematic(AABB *chunkBox, LevelChunk *
 	if(chunk->level->dimension->id != m_dimension) return;
 
 	PIXBeginNamedEvent(0, "Processing ApplySchematicRuleDefinition");
-	if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
+	if(m_schematic == nullptr) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
 
-	if(m_locationBox == NULL) updateLocationBox();
+	if(m_locationBox == nullptr) updateLocationBox();
 	if(chunkBox->intersects( m_locationBox ))
 	{
 		m_locationBox->y1 = min((double)Level::maxBuildHeight, m_locationBox->y1 );
@@ -189,7 +189,7 @@ void ApplySchematicRuleDefinition::processSchematic(AABB *chunkBox, LevelChunk *
 		{
 			m_completed = true;
 			//m_levelGenOptions->releaseSchematicFile(m_schematicName);
-			//m_schematic = NULL;
+			//m_schematic = nullptr;
 		}
 	}
 	PIXEndNamedEvent();
@@ -201,9 +201,9 @@ void ApplySchematicRuleDefinition::processSchematicLighting(AABB *chunkBox, Leve
 	if(chunk->level->dimension->id != m_dimension) return;
 
 	PIXBeginNamedEvent(0, "Processing ApplySchematicRuleDefinition (lighting)");
-	if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
+	if(m_schematic == nullptr) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
 
-	if(m_locationBox == NULL) updateLocationBox();
+	if(m_locationBox == nullptr) updateLocationBox();
 	if(chunkBox->intersects( m_locationBox ))
 	{
 		m_locationBox->y1 = min((double)Level::maxBuildHeight, m_locationBox->y1 );
@@ -223,7 +223,7 @@ void ApplySchematicRuleDefinition::processSchematicLighting(AABB *chunkBox, Leve
 		{
 			m_completed = true;
 			//m_levelGenOptions->releaseSchematicFile(m_schematicName);
-			//m_schematic = NULL;
+			//m_schematic = nullptr;
 		}
 	}
 	PIXEndNamedEvent();
@@ -231,13 +231,13 @@ void ApplySchematicRuleDefinition::processSchematicLighting(AABB *chunkBox, Leve
 
 bool ApplySchematicRuleDefinition::checkIntersects(int x0, int y0, int z0, int x1, int y1, int z1)
 {
-	if( m_locationBox == NULL ) updateLocationBox();
+	if( m_locationBox == nullptr ) updateLocationBox();
 	return m_locationBox->intersects(x0,y0,z0,x1,y1,z1);
 }
 
 int ApplySchematicRuleDefinition::getMinY()
 {
-	if( m_locationBox == NULL ) updateLocationBox();
+	if( m_locationBox == nullptr ) updateLocationBox();
 	return m_locationBox->y0;
 }
 
diff --git a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.h b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.h
index 21c42dea..e5dffb3c 100644
--- a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.h
+++ b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.h
@@ -19,17 +19,17 @@ private:
 	ConsoleSchematicFile::ESchematicRotation m_rotation;
 	int m_dimension;
 
-	__int64 m_totalBlocksChanged;
-	__int64 m_totalBlocksChangedLighting;
+	int64_t m_totalBlocksChanged;
+	int64_t m_totalBlocksChangedLighting;
 	bool m_completed;
 
 	void updateLocationBox();
-public:	
+public:
 	ApplySchematicRuleDefinition(LevelGenerationOptions *levelGenOptions);
 	~ApplySchematicRuleDefinition();
 
 	virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_ApplySchematic; }
-	
+
 	virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs);
 	virtual void addAttribute(const wstring &attributeName, const wstring &attributeValue);
 
diff --git a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
index f3b48445..7f03a0fe 100644
--- a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
@@ -77,7 +77,7 @@ void CollectItemRuleDefinition::populateGameRule(GameRulesInstance::EGameRulesIn
 bool CollectItemRuleDefinition::onCollectItem(GameRule *rule, shared_ptr<ItemInstance> item)
 {
 	bool statusChanged = false;
-	if(item != NULL && item->id == m_itemId && item->getAuxValue() == m_auxValue && item->get4JData() == m_4JDataValue)
+	if(item != nullptr && item->id == m_itemId && item->getAuxValue() == m_auxValue && item->get4JData() == m_4JDataValue)
 	{
 		if(!getComplete(rule))
 		{
@@ -90,13 +90,21 @@ bool CollectItemRuleDefinition::onCollectItem(GameRule *rule, shared_ptr<ItemIns
 			if(quantityCollected >= m_quantity)
 			{
 				setComplete(rule, true);
-				app.DebugPrintf("Completed CollectItemRule with info - itemId:%d, auxValue:%d, quantity:%d, dataTag:%d\n", m_itemId,m_auxValue,m_quantity,m_4JDataValue);
-
-				if(rule->getConnection() != NULL)
-				{
-					rule->getConnection()->send( shared_ptr<UpdateGameRuleProgressPacket>( new UpdateGameRuleProgressPacket(getActionType(), this->m_descriptionId, m_itemId, m_auxValue, this->m_4JDataValue,NULL,0)));
-				}
-			}
+                app.DebugPrintf("Completed CollectItemRule with info - itemId:%d, auxValue:%d, quantity:%d, dataTag:%d\n", m_itemId, m_auxValue, m_quantity, m_4JDataValue);
+
+                if (rule->getConnection() != nullptr)
+                {
+                    rule->getConnection()->send(std::make_shared<UpdateGameRuleProgressPacket>(
+                        getActionType(),
+                        this->m_descriptionId,
+                        m_itemId,
+                        m_auxValue,
+                        this->m_4JDataValue,
+                        nullptr,
+                        static_cast<DWORD>(0)
+                        ));
+                }
+            }
 		}
 	}
 	return statusChanged;
@@ -106,7 +114,7 @@ wstring CollectItemRuleDefinition::generateXml(shared_ptr<ItemInstance> item)
 {
 	// 4J Stu - This should be kept in sync with the GameRulesDefinition.xsd
 	wstring xml = L"";
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		xml = L"<CollectItemRule itemId=\"" + std::to_wstring(item->id) + L"\" quantity=\"SET\" descriptionName=\"OPTIONAL\" promptName=\"OPTIONAL\"";
 		if(item->getAuxValue() != 0) xml += L" auxValue=\"" + std::to_wstring(item->getAuxValue()) + L"\"";
diff --git a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
index b928b26c..cd23cd50 100644
--- a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
@@ -36,7 +36,7 @@ void CompleteAllRuleDefinition::updateStatus(GameRule *rule)
 			progress += it.second.gr->getGameRuleDefinition()->getProgress(it.second.gr);
 		}
 	}
-	if(rule->getConnection() != NULL)
+	if(rule->getConnection() != nullptr)
 	{
 		PacketData data;
 		data.goal = goal;
@@ -45,20 +45,20 @@ void CompleteAllRuleDefinition::updateStatus(GameRule *rule)
 		int icon = -1;
 		int auxValue = 0;
 
-		if(m_lastRuleStatusChanged != NULL)
+		if(m_lastRuleStatusChanged != nullptr)
 		{
 			icon = m_lastRuleStatusChanged->getIcon();
 			auxValue = m_lastRuleStatusChanged->getAuxValue();
-			m_lastRuleStatusChanged = NULL;
+			m_lastRuleStatusChanged = nullptr;
 		}
-		rule->getConnection()->send( shared_ptr<UpdateGameRuleProgressPacket>( new UpdateGameRuleProgressPacket(getActionType(), this->m_descriptionId,icon, auxValue, 0,&data,sizeof(PacketData))));
+		rule->getConnection()->send(std::make_shared<UpdateGameRuleProgressPacket>(getActionType(), this->m_descriptionId, icon, auxValue, 0, &data, sizeof(PacketData)));
 	}
 	app.DebugPrintf("Updated CompleteAllRule - Completed %d of %d\n", progress, goal);
 }
 
 wstring CompleteAllRuleDefinition::generateDescriptionString(const wstring &description, void *data, int dataLength)
 {
-	PacketData *values = (PacketData *)data;
+	PacketData *values = static_cast<PacketData *>(data);
 	wstring newDesc = description;
 	newDesc = replaceAll(newDesc,L"{*progress*}",std::to_wstring(values->progress));
 	newDesc = replaceAll(newDesc,L"{*goal*}",std::to_wstring(values->goal));
diff --git a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
index 395b4eeb..f75eddd4 100644
--- a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
@@ -6,7 +6,7 @@
 
 CompoundGameRuleDefinition::CompoundGameRuleDefinition()
 {
-	m_lastRuleStatusChanged = NULL;
+	m_lastRuleStatusChanged = nullptr;
 }
 
 CompoundGameRuleDefinition::~CompoundGameRuleDefinition()
@@ -26,7 +26,7 @@ void CompoundGameRuleDefinition::getChildren(vector<GameRuleDefinition *> *child
 
 GameRuleDefinition *CompoundGameRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_CompleteAllRule)
 	{
 		rule = new CompleteAllRuleDefinition();
@@ -49,13 +49,13 @@ GameRuleDefinition *CompoundGameRuleDefinition::addChild(ConsoleGameRules::EGame
 		wprintf(L"CompoundGameRuleDefinition: Attempted to add invalid child rule - %d\n", ruleType );
 #endif
 	}
-	if(rule != NULL) m_children.push_back(rule);
+	if(rule != nullptr) m_children.push_back(rule);
 	return rule;
 }
 
 void CompoundGameRuleDefinition::populateGameRule(GameRulesInstance::EGameRulesInstanceType type, GameRule *rule)
 {
-	GameRule *newRule = NULL;
+	GameRule *newRule = nullptr;
 	int i = 0;
 	for (auto& it : m_children )
 	{
diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
index f505ce7a..dd777682 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
+++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
@@ -10,7 +10,7 @@
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
 {
 	m_x = m_y = m_z = 0;
-	boundingBox = NULL;
+	boundingBox = nullptr;
 	orientation = Direction::NORTH;
 	m_dimension = 0;
 }
@@ -25,26 +25,26 @@ void ConsoleGenerateStructure::getChildren(vector<GameRuleDefinition *> *childre
 
 GameRuleDefinition *ConsoleGenerateStructure::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_GenerateBox)
 	{
 		rule = new XboxStructureActionGenerateBox();
-		m_actions.push_back((XboxStructureActionGenerateBox *)rule);
+		m_actions.push_back(static_cast<XboxStructureActionGenerateBox *>(rule));
 	}
 	else if(ruleType == ConsoleGameRules::eGameRuleType_PlaceBlock)
 	{
 		rule = new XboxStructureActionPlaceBlock();
-		m_actions.push_back((XboxStructureActionPlaceBlock *)rule);
+		m_actions.push_back(static_cast<XboxStructureActionPlaceBlock *>(rule));
 	}
 	else if(ruleType == ConsoleGameRules::eGameRuleType_PlaceContainer)
 	{
 		rule = new XboxStructureActionPlaceContainer();
-		m_actions.push_back((XboxStructureActionPlaceContainer *)rule);
+		m_actions.push_back(static_cast<XboxStructureActionPlaceContainer *>(rule));
 	}
 	else if(ruleType == ConsoleGameRules::eGameRuleType_PlaceSpawner)
 	{
 		rule = new XboxStructureActionPlaceSpawner();
-		m_actions.push_back((XboxStructureActionPlaceSpawner *)rule);
+		m_actions.push_back(static_cast<XboxStructureActionPlaceSpawner *>(rule));
 	}
 	else
 	{
@@ -112,7 +112,7 @@ void ConsoleGenerateStructure::addAttribute(const wstring &attributeName, const
 
 BoundingBox* ConsoleGenerateStructure::getBoundingBox()
 {
-	if(boundingBox == NULL)
+	if(boundingBox == nullptr)
 	{
 		// Find the max bounds
 		int maxX, maxY, maxZ;
@@ -139,25 +139,25 @@ bool ConsoleGenerateStructure::postProcess(Level *level, Random *random, Boundin
 		{
 		case ConsoleGameRules::eGameRuleType_GenerateBox:
 			{
-				XboxStructureActionGenerateBox *genBox = (XboxStructureActionGenerateBox *)action;
+				XboxStructureActionGenerateBox *genBox = static_cast<XboxStructureActionGenerateBox *>(action);
 				genBox->generateBoxInLevel(this,level,chunkBB);
 			}
 			break;
 		case ConsoleGameRules::eGameRuleType_PlaceBlock:
 			{
-				XboxStructureActionPlaceBlock *pPlaceBlock = (XboxStructureActionPlaceBlock *)action;
+				XboxStructureActionPlaceBlock *pPlaceBlock = static_cast<XboxStructureActionPlaceBlock *>(action);
 				pPlaceBlock->placeBlockInLevel(this,level,chunkBB);
 			}
 			break;
 		case ConsoleGameRules::eGameRuleType_PlaceContainer:
 			{
-				XboxStructureActionPlaceContainer *pPlaceContainer = (XboxStructureActionPlaceContainer *)action;
+				XboxStructureActionPlaceContainer *pPlaceContainer = static_cast<XboxStructureActionPlaceContainer *>(action);
 				pPlaceContainer->placeContainerInLevel(this,level,chunkBB);
 			}
 			break;
 		case ConsoleGameRules::eGameRuleType_PlaceSpawner:
 			{
-				XboxStructureActionPlaceSpawner *pPlaceSpawner = (XboxStructureActionPlaceSpawner *)action;
+				XboxStructureActionPlaceSpawner *pPlaceSpawner = static_cast<XboxStructureActionPlaceSpawner *>(action);
 				pPlaceSpawner->placeSpawnerInLevel(this,level,chunkBB);
 			}
 			break;
diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
index 91c4ef35..712a29ab 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
@@ -36,7 +36,7 @@ public:
 
 	virtual int getMinY();
 
-	EStructurePiece GetType() { return (EStructurePiece)0; }
+	EStructurePiece GetType() { return static_cast<EStructurePiece>(0); }
 	void addAdditonalSaveData(CompoundTag *tag) {}
 	void readAdditonalSaveData(CompoundTag *tag) {}
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
index 01a8119e..c261e0cd 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
+++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
@@ -16,18 +16,18 @@ ConsoleSchematicFile::ConsoleSchematicFile()
 {
 	m_xSize = m_ySize = m_zSize = 0;
 	m_refCount = 1;
-	m_data.data = NULL;
+	m_data.data = nullptr;
 }
 
 ConsoleSchematicFile::~ConsoleSchematicFile()
 {
 	app.DebugPrintf("Deleting schematic file\n");
-	if(m_data.data != NULL) delete [] m_data.data;
+	if(m_data.data != nullptr) delete [] m_data.data;
 }
 
 void ConsoleSchematicFile::save(DataOutputStream *dos)
 {
-	if(dos != NULL)
+	if(dos != nullptr)
 	{
 		dos->writeInt(XBOX_SCHEMATIC_CURRENT_VERSION);
 
@@ -38,7 +38,7 @@ void ConsoleSchematicFile::save(DataOutputStream *dos)
 		dos->writeInt(m_zSize);
 
 		byteArray ba(new BYTE[ m_data.length ], m_data.length);
-		Compression::getCompression()->CompressLZXRLE(	ba.data, &ba.length, 
+		Compression::getCompression()->CompressLZXRLE(	ba.data, &ba.length,
 													m_data.data, m_data.length);
 
 		dos->writeInt(ba.length);
@@ -52,7 +52,7 @@ void ConsoleSchematicFile::save(DataOutputStream *dos)
 
 void ConsoleSchematicFile::load(DataInputStream *dis)
 {
-	if(dis != NULL)
+	if(dis != nullptr)
 	{
 		// VERSION CHECK //
 		int version = dis->readInt();
@@ -61,7 +61,7 @@ void ConsoleSchematicFile::load(DataInputStream *dis)
 
 		if (version > XBOX_SCHEMATIC_ORIGINAL_VERSION) // Or later versions
 		{
-			compressionType = (Compression::ECompressionTypes)dis->readByte();
+			compressionType = static_cast<Compression::ECompressionTypes>(dis->readByte());
 		}
 
 		if (version > XBOX_SCHEMATIC_CURRENT_VERSION)
@@ -71,14 +71,14 @@ void ConsoleSchematicFile::load(DataInputStream *dis)
 		m_ySize = dis->readInt();
 		m_zSize = dis->readInt();
 
-		int compressedSize = dis->readInt();		
+		int compressedSize = dis->readInt();
 		byteArray compressedBuffer(compressedSize);
 		dis->readFully(compressedBuffer);
 
-		if(m_data.data != NULL)
+		if(m_data.data != nullptr)
 		{
 			delete [] m_data.data; 
-			m_data.data = NULL;
+			m_data.data = nullptr;
 		}
 
 		if(compressionType == Compression::eCompressionType_None)
@@ -111,17 +111,17 @@ void ConsoleSchematicFile::load(DataInputStream *dis)
 		// READ TAGS //
 		CompoundTag *tag = NbtIo::read(dis);
 		ListTag<CompoundTag> *tileEntityTags = (ListTag<CompoundTag> *) tag->getList(L"TileEntities");
-		if (tileEntityTags != NULL)
+		if (tileEntityTags != nullptr)
 		{
 			for (int i = 0; i < tileEntityTags->size(); i++)
 			{
 				CompoundTag *teTag = tileEntityTags->get(i);
 				shared_ptr<TileEntity> te = TileEntity::loadStatic(teTag);
 
-				if(te == NULL)
+				if(te == nullptr)
 				{
 #ifndef _CONTENT_PACKAGE
-					app.DebugPrintf("ConsoleSchematicFile has read a NULL tile entity\n");
+					app.DebugPrintf("ConsoleSchematicFile has read a nullptr tile entity\n");
 					__debugbreak();
 #endif
 				}
@@ -132,7 +132,7 @@ void ConsoleSchematicFile::load(DataInputStream *dis)
 			}
 		}
 		ListTag<CompoundTag> *entityTags = (ListTag<CompoundTag> *) tag->getList(L"Entities");
-		if (entityTags != NULL)
+		if (entityTags != nullptr)
 		{
 			for (int i = 0; i < entityTags->size(); i++)
 			{
@@ -145,15 +145,15 @@ void ConsoleSchematicFile::load(DataInputStream *dis)
 				double z = pos->get(2)->data;
 
 				if( type == eTYPE_PAINTING || type == eTYPE_ITEM_FRAME )
-				{					
-					x = ((IntTag *) eTag->get(L"TileX") )->data;
-					y = ((IntTag *) eTag->get(L"TileY") )->data;
-					z = ((IntTag *) eTag->get(L"TileZ") )->data;
-				}
+                {
+                    x = static_cast<IntTag *>(eTag->get(L"TileX"))->data;
+                    y = static_cast<IntTag *>(eTag->get(L"TileY"))->data;
+                    z = static_cast<IntTag *>(eTag->get(L"TileZ"))->data;
+                }
 #ifdef _DEBUG
 				//app.DebugPrintf(1,"Loaded entity type %d at (%f,%f,%f)\n",(int)type,x,y,z);
 #endif
-				m_entities.push_back( pair<Vec3 *, CompoundTag *>(Vec3::newPermanent(x,y,z),(CompoundTag *)eTag->copy()));
+				m_entities.push_back( pair<Vec3 *, CompoundTag *>(Vec3::newPermanent(x,y,z),static_cast<CompoundTag *>(eTag->copy())));
 			}
 		}
 		delete tag;
@@ -178,23 +178,23 @@ void ConsoleSchematicFile::save_tags(DataOutputStream *dos)
 	tag->put(L"Entities", entityTags);
 
 	for (auto& it : m_entities )
-		entityTags->add( (CompoundTag *)(it).second->copy() );
+		entityTags->add( static_cast<CompoundTag *>((it).second->copy()) );
 
 	NbtIo::write(tag,dos);
 	delete tag;
 }
 
-__int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot)
+int64_t ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot)
 {
-	int xStart = static_cast<int>(std::fmax<double>(destinationBox->x0, (double)chunk->x*16));
-	int xEnd = static_cast<int>(std::fmin<double>(destinationBox->x1, (double)((xStart >> 4) << 4) + 16));
+	int xStart = static_cast<int>(std::fmax<double>(destinationBox->x0, static_cast<double>(chunk->x)*16));
+	int xEnd = static_cast<int>(std::fmin<double>(destinationBox->x1, static_cast<double>((xStart >> 4) << 4) + 16));
 
 	int yStart = destinationBox->y0;
 	int yEnd = destinationBox->y1;
 	if(yEnd > Level::maxBuildHeight) yEnd = Level::maxBuildHeight;
 
-	int zStart = static_cast<int>(std::fmax<double>(destinationBox->z0, (double)chunk->z * 16));
-	int zEnd = static_cast<int>(std::fmin<double>(destinationBox->z1, (double)((zStart >> 4) << 4) + 16));
+	int zStart = static_cast<int>(std::fmax<double>(destinationBox->z0, static_cast<double>(chunk->z) * 16));
+	int zEnd = static_cast<int>(std::fmin<double>(destinationBox->z1, static_cast<double>((zStart >> 4) << 4) + 16));
 
 #ifdef _DEBUG
 	app.DebugPrintf("Range is (%d,%d,%d) to (%d,%d,%d)\n",xStart,yStart,zStart,xEnd-1,yEnd-1,zEnd-1);
@@ -281,7 +281,7 @@ __int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkB
 	//		blockData[i] = Tile::endStone_Id;
 	//	}
 	//}
-	
+
 	PIXBeginNamedEvent(0,"Setting Block data");
 	chunk->setBlockData(blockData);
 	PIXEndNamedEvent();
@@ -323,7 +323,7 @@ __int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkB
 
 // At the point that this is called, we have all the neighbouring chunks loaded in (and generally post-processed, apart from this lighting pass), so
 // we can do the sort of lighting that might propagate out of the chunk.
-__int64 ConsoleSchematicFile::applyLighting(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot)
+int64_t ConsoleSchematicFile::applyLighting(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot)
 {
 	int xStart = max(destinationBox->x0, (double)chunk->x*16);
 	int xEnd = min(destinationBox->x1, (double)((xStart>>4)<<4) + 16);
@@ -442,9 +442,9 @@ void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox,
 		Vec3 *pos = Vec3::newTemp(targetX,targetY,targetZ);
 		if( chunkBox->containsIncludingLowerBound(pos) )
 		{
-			shared_ptr<TileEntity> teCopy = chunk->getTileEntity( (int)targetX & 15, (int)targetY & 15, (int)targetZ & 15 );
+			shared_ptr<TileEntity> teCopy = chunk->getTileEntity( static_cast<int>(targetX) & 15, static_cast<int>(targetY) & 15, static_cast<int>(targetZ) & 15 );
 
-			if ( teCopy != NULL )
+			if ( teCopy != nullptr )
 			{				
 				CompoundTag *teData = new CompoundTag();
 				te->save(teData);
@@ -478,7 +478,7 @@ void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox,
 	for (auto it = m_entities.begin(); it != m_entities.end();)
 	{
 		Vec3 *source = it->first;
-		
+
 		double targetX = source->x;
 		double targetY = source->y + destinationBox->y0;
 		double targetZ = source->z;
@@ -493,12 +493,12 @@ void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox,
 		}
 
 		CompoundTag *eTag = it->second;
-		shared_ptr<Entity> e = EntityIO::loadStatic(eTag, NULL);
+		shared_ptr<Entity> e = EntityIO::loadStatic(eTag, nullptr);
 
 		if( e->GetType() == eTYPE_PAINTING )
 		{
 			shared_ptr<Painting> painting = dynamic_pointer_cast<Painting>(e);
-				
+
 			double tileX = painting->xTile;
 			double tileZ = painting->zTile;
 			schematicCoordToChunkCoord(destinationBox, painting->xTile, painting->zTile, rot, tileX, tileZ);
@@ -511,7 +511,7 @@ void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox,
 		else if( e->GetType() == eTYPE_ITEM_FRAME )
 		{
 			shared_ptr<ItemFrame> frame = dynamic_pointer_cast<ItemFrame>(e);
-				
+
 			double tileX = frame->xTile;
 			double tileZ = frame->zTile;
 			schematicCoordToChunkCoord(destinationBox, frame->xTile, frame->zTile, rot, tileX, tileZ);
@@ -559,7 +559,7 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 		zStart-=1;
 	else if(zStart < 0 && zStart%2 !=0)
 		zStart-=1;
-	
+
 	// We want the end to be odd to have a total size that is even
 	if(xEnd > 0 && xEnd%2 == 0)
 		xEnd+=1;
@@ -582,18 +582,18 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 
 	app.DebugPrintf("Generating schematic file for area (%d,%d,%d) to (%d,%d,%d), %dx%dx%d\n",xStart,yStart,zStart,xEnd,yEnd,zEnd,xSize,ySize,zSize);
 
-	if(dos != NULL) dos->writeInt(XBOX_SCHEMATIC_CURRENT_VERSION);
+	if(dos != nullptr) dos->writeInt(XBOX_SCHEMATIC_CURRENT_VERSION);
 
-	if(dos != NULL) dos->writeByte(compressionType);
+	if(dos != nullptr) dos->writeByte(compressionType);
 
 	//Write xSize
-	if(dos != NULL) dos->writeInt(xSize);
+	if(dos != nullptr) dos->writeInt(xSize);
 
 	//Write ySize
-	if(dos != NULL) dos->writeInt(ySize);
+	if(dos != nullptr) dos->writeInt(ySize);
 
 	//Write zSize
-	if(dos != NULL) dos->writeInt(zSize);
+	if(dos != nullptr) dos->writeInt(zSize);
 
 	//byteArray rawBuffer = level->getBlocksAndData(xStart, yStart, zStart, xSize, ySize, zSize, false);
 	int xRowSize = ySize * zSize;
@@ -613,7 +613,7 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 
 	// Every x is a whole row
 	for(int xPos = xStart; xPos < xStart + xSize; ++xPos)
-	{			
+	{
 		int xc = xPos >> 4;
 
 		int x0 = xPos - xc * 16;
@@ -622,7 +622,7 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 		if (x1 > 16) x1 = 16;
 
 		for(int zPos = zStart; zPos < zStart + zSize;)
-		{				
+		{
 			int zc = zPos >> 4;
 
 			int z0 = zStart - zc * 16;
@@ -660,8 +660,8 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 	delete [] result.data;
 	byteArray buffer = byteArray(ucTemp,inputSize);
 
-	if(dos != NULL) dos->writeInt(inputSize);
-	if(dos != NULL) dos->write(buffer);
+	if(dos != nullptr) dos->writeInt(inputSize);
+	if(dos != nullptr) dos->write(buffer);
 	delete [] buffer.data;
 
 	CompoundTag tag;
@@ -713,11 +713,11 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 		}
 
 		// 4J-JEV: Changed to check for instances of minecarts and hangingEntities instead of just eTYPE_PAINTING, eTYPE_ITEM_FRAME and eTYPE_MINECART
-		if (mobCanBeSaved || e->instanceof(eTYPE_MINECART)  || e->GetType() == eTYPE_BOAT || e->instanceof(eTYPE_HANGING_ENTITY)) 
+		if (mobCanBeSaved || e->instanceof(eTYPE_MINECART)  || e->GetType() == eTYPE_BOAT || e->instanceof(eTYPE_HANGING_ENTITY))
 		{
 			CompoundTag *eTag = new CompoundTag();
 			if( e->save(eTag) )
-			{			
+			{
 				ListTag<DoubleTag> *pos = (ListTag<DoubleTag> *) eTag->getList(L"Pos");
 
 				pos->get(0)->data -= xStart;
@@ -726,9 +726,9 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 
 				if( e->instanceof(eTYPE_HANGING_ENTITY) )
 				{					
-					((IntTag *) eTag->get(L"TileX") )->data -= xStart;
-					((IntTag *) eTag->get(L"TileY") )->data -= yStart;
-					((IntTag *) eTag->get(L"TileZ") )->data -= zStart;
+					static_cast<IntTag *>(eTag->get(L"TileX"))->data -= xStart;
+					static_cast<IntTag *>(eTag->get(L"TileY"))->data -= yStart;
+					static_cast<IntTag *>(eTag->get(L"TileZ"))->data -= zStart;
 				}
 
 				entitiesTag->add(eTag);
@@ -738,7 +738,7 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
 
 	tag.put(L"Entities", entitiesTag);
 
-	if(dos != NULL) NbtIo::write(&tag,dos);
+	if(dos != nullptr) NbtIo::write(&tag,dos);
 }
 
 void ConsoleSchematicFile::getBlocksAndData(LevelChunk *chunk, byteArray *data, int x0, int y0, int z0, int x1, int y1, int z1, int &blocksP, int &dataP, int &blockLightP, int &skyLightP)
@@ -766,7 +766,7 @@ void ConsoleSchematicFile::getBlocksAndData(LevelChunk *chunk, byteArray *data,
 	//	skyLightP += skyLightData.length;
 	//	return;
 	//}
-	
+
 	bool bHasLower, bHasUpper;
 	bHasLower = bHasUpper = false;
 	int lowerY0, lowerY1, upperY0, upperY1;
diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
index f37a6058..b0eebf9e 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
@@ -58,7 +58,7 @@ private:
 	vector<shared_ptr<TileEntity> > m_tileEntities;
 	vector< pair<Vec3 *, CompoundTag *> > m_entities;
 
-public:	
+public:
 	byteArray m_data;
 
 public:
@@ -72,8 +72,8 @@ public:
 	void save(DataOutputStream *dos);
 	void load(DataInputStream *dis);
 
-	__int64 applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot);
-	__int64 applyLighting(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot);
+	int64_t applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot);
+	int64_t applyLighting(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot);
 	void applyTileEntities(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot);
 
 	static void generateSchematicFile(DataOutputStream *dos, Level *level, int xStart, int yStart, int zStart, int xEnd, int yEnd, int zEnd, bool bSaveMobs, Compression::ECompressionTypes);
diff --git a/Minecraft.Client/Common/GameRules/GameRule.h b/Minecraft.Client/Common/GameRules/GameRule.h
index bdc2ceff..e35f1375 100644
--- a/Minecraft.Client/Common/GameRules/GameRule.h
+++ b/Minecraft.Client/Common/GameRules/GameRule.h
@@ -14,7 +14,7 @@ public:
 	typedef struct _ValueType
 	{
 		union{
-			__int64				i64;
+			int64_t				i64;
 			int					i;
 			char				c;
 			bool				b;
@@ -40,11 +40,11 @@ public:
 	stringValueMapType m_parameters; // These are the members of this rule that maintain it's state
 
 public:
-	GameRule(GameRuleDefinition *definition, Connection *connection = NULL);
+	GameRule(GameRuleDefinition *definition, Connection *connection = nullptr);
 	virtual ~GameRule();
 
 	Connection *getConnection() { return m_connection; }
-	
+
 	ValueType getParameter(const wstring &parameterName);
 	void setParameter(const wstring &parameterName,ValueType value);
 	GameRuleDefinition *getGameRuleDefinition();
diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
index 80d02956..770b56d5 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
@@ -50,7 +50,7 @@ GameRuleDefinition *GameRuleDefinition::addChild(ConsoleGameRules::EGameRuleType
 #ifndef _CONTENT_PACKAGE
 		wprintf(L"GameRuleDefinition: Attempted to add invalid child rule - %d\n", ruleType );
 #endif
-	return NULL;
+	return nullptr;
 }
 
 void GameRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue)
diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
index afec8fbc..4a2c43a1 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
+++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
@@ -61,6 +61,6 @@ public:
 
 	// Static functions
 	static GameRulesInstance *generateNewGameRulesInstance(GameRulesInstance::EGameRulesInstanceType type, LevelRuleset *rules, Connection *connection);
-	static wstring generateDescriptionString(ConsoleGameRules::EGameRuleType defType, const wstring &description, void *data = NULL, int dataLength = 0);
+	static wstring generateDescriptionString(ConsoleGameRules::EGameRuleType defType, const wstring &description, void *data = nullptr, int dataLength = 0);
 
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
index f18aa7ae..95434c08 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
@@ -12,7 +12,7 @@
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 
-WCHAR *GameRuleManager::wchTagNameA[] =
+const WCHAR *GameRuleManager::wchTagNameA[] =
 {
 	L"", // eGameRuleType_Root
 	L"MapOptions", // eGameRuleType_LevelGenerationOptions
@@ -34,7 +34,7 @@ WCHAR *GameRuleManager::wchTagNameA[] =
 	L"UpdatePlayer", // eGameRuleType_UpdatePlayerRule
 };
 
-WCHAR *GameRuleManager::wchAttrNameA[] =
+const WCHAR *GameRuleManager::wchAttrNameA[] =
 {
 	L"descriptionName", // eGameRuleAttr_descriptionName
 	L"promptName", // eGameRuleAttr_promptName
@@ -85,24 +85,24 @@ WCHAR *GameRuleManager::wchAttrNameA[] =
 
 GameRuleManager::GameRuleManager()
 {
-	m_currentGameRuleDefinitions = NULL;
-	m_currentLevelGenerationOptions = NULL;
+	m_currentGameRuleDefinitions = nullptr;
+	m_currentLevelGenerationOptions = nullptr;
 }
 
 void GameRuleManager::loadGameRules(DLCPack *pack)
 {
-	StringTable *strings = NULL;
+	StringTable *strings = nullptr;
 
 	if(pack->doesPackContainFile(DLCManager::e_DLCType_LocalisationData,L"languages.loc"))
 	{
-		DLCLocalisationFile *localisationFile = (DLCLocalisationFile *)pack->getFile(DLCManager::e_DLCType_LocalisationData, L"languages.loc");
+		DLCLocalisationFile *localisationFile = static_cast<DLCLocalisationFile *>(pack->getFile(DLCManager::e_DLCType_LocalisationData, L"languages.loc"));
 		strings = localisationFile->getStringTable();
 	}
 
 	int gameRulesCount = pack->getDLCItemsCount(DLCManager::e_DLCType_GameRulesHeader);
 	for(int i = 0; i < gameRulesCount; ++i)
 	{
-		DLCGameRulesHeader *dlcHeader = (DLCGameRulesHeader *)pack->getFile(DLCManager::e_DLCType_GameRulesHeader, i);
+		DLCGameRulesHeader *dlcHeader = static_cast<DLCGameRulesHeader *>(pack->getFile(DLCManager::e_DLCType_GameRulesHeader, i));
 		DWORD dSize;
 		byte *dData = dlcHeader->getData(dSize);
 
@@ -120,7 +120,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
 	gameRulesCount = pack->getDLCItemsCount(DLCManager::e_DLCType_GameRules);
 	for (int i = 0; i < gameRulesCount; ++i)
 	{
-		DLCGameRulesFile *dlcFile = (DLCGameRulesFile *)pack->getFile(DLCManager::e_DLCType_GameRules, i);
+		DLCGameRulesFile *dlcFile = static_cast<DLCGameRulesFile *>(pack->getFile(DLCManager::e_DLCType_GameRules, i));
 
 		DWORD dSize;
 		byte *dData = dlcFile->getData(dSize);
@@ -182,7 +182,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT
 				compr_content(new BYTE[compr_len], compr_len);
 	dis.read(compr_content);
 
-	Compression::getCompression()->SetDecompressionType( (Compression::ECompressionTypes)compression_type );
+	Compression::getCompression()->SetDecompressionType( static_cast<Compression::ECompressionTypes>(compression_type) );
 	Compression::getCompression()->DecompressLZXRLE(	content.data, &content.length,
 													compr_content.data, compr_content.length);
 	Compression::getCompression()->SetDecompressionType( SAVE_FILE_PLATFORM_LOCAL );
@@ -237,11 +237,11 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT
 // 4J-JEV: Reverse of loadGameRules.
 void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
 {
-	if (m_currentGameRuleDefinitions == NULL &&
-		m_currentLevelGenerationOptions == NULL)
+	if (m_currentGameRuleDefinitions == nullptr &&
+		m_currentLevelGenerationOptions == nullptr)
 	{
 		app.DebugPrintf("GameRuleManager:: Nothing here to save.");
-		*dOut = NULL;
+		*dOut = nullptr;
 		*dSize = 0;
 		return;
 	}
@@ -268,7 +268,7 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
 	ByteArrayOutputStream compr_baos;
 	DataOutputStream compr_dos(&compr_baos);
 
-	if (m_currentGameRuleDefinitions == NULL)
+	if (m_currentGameRuleDefinitions == nullptr)
 	{
 		compr_dos.writeInt( 0 ); // numStrings for StringTable
 		compr_dos.writeInt( version_number );
@@ -282,9 +282,9 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
 	{
 		StringTable *st = m_currentGameRuleDefinitions->getStringTable();
 
-		if (st == NULL)
+		if (st == nullptr)
 		{
-			app.DebugPrintf("GameRuleManager::saveGameRules: StringTable == NULL!");
+			app.DebugPrintf("GameRuleManager::saveGameRules: StringTable == nullptr!");
 		}
 		else
 		{
@@ -322,7 +322,7 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
 	*dSize = baos.buf.length;
 	*dOut = baos.buf.data;
 
-	baos.buf.data = NULL;
+	baos.buf.data = nullptr;
 
 	dos.close(); baos.close();
 }
@@ -344,6 +344,7 @@ void GameRuleManager::writeRuleFile(DataOutputStream *dos)
 	// Write schematic files.
 	unordered_map<wstring, ConsoleSchematicFile *> *files;
 	files = getLevelGenerationOptions()->getUnfinishedSchematicFiles();
+	dos->writeInt((int)files->size());
 	for ( auto& it : *files )
 	{
 		const wstring& filename = it.first;
@@ -385,7 +386,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
 	// Read File.
 
 	// version_number
-	__int64 version = dis.readShort();
+	int64_t version = dis.readShort();
 	unsigned char compressionType = 0;
 	if(version == 0)
 	{
@@ -399,8 +400,8 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
 		for(int i = 0; i < 8; ++i) dis.readBoolean();
 	}
 
-	ByteArrayInputStream *contentBais = NULL;
-	DataInputStream *contentDis = NULL;
+	ByteArrayInputStream *contentBais = nullptr;
+	DataInputStream *contentDis = nullptr;
 
 	if(compressionType == Compression::eCompressionType_None)
 	{
@@ -469,13 +470,13 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
 		tagsAndAtts.push_back( contentDis->readUTF() );
 
 	unordered_map<int, ConsoleGameRules::EGameRuleType> tagIdMap;
-	for(int type = (int)ConsoleGameRules::eGameRuleType_Root; type < (int)ConsoleGameRules::eGameRuleType_Count; ++type)
+	for(int type = (int)ConsoleGameRules::eGameRuleType_Root; type < static_cast<int>(ConsoleGameRules::eGameRuleType_Count); ++type)
 	{
 		for(UINT i = 0; i < numStrings; ++i)
 		{
 			if(tagsAndAtts[i].compare(wchTagNameA[type]) == 0)
 			{
-				tagIdMap.insert( unordered_map<int, ConsoleGameRules::EGameRuleType>::value_type(i, (ConsoleGameRules::EGameRuleType)type) );
+				tagIdMap.insert( unordered_map<int, ConsoleGameRules::EGameRuleType>::value_type(i, static_cast<ConsoleGameRules::EGameRuleType>(type)) );
 				break;
 			}
 		}
@@ -497,17 +498,36 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
 	}*/
 
 	// subfile
+	// Old saves didn't write a numFiles count before the schematic entries.
+	// Detect this: a real count is small, but a UTF filename prefix reads as a large int.
 	UINT numFiles = contentDis->readInt();
-	for (UINT i = 0; i < numFiles; i++)
-	{
-		wstring sFilename = contentDis->readUTF();
-		int length = contentDis->readInt();
-		byteArray ba( length );
-
-		contentDis->read(ba);
-
-		levelGenerator->loadSchematicFile(sFilename, ba.data, ba.length);
 
+	if (lgo->isFromSave() && numFiles > 100)
+	{
+		contentDis->skip(-4);
+		while (true)
+		{
+			int peek = contentDis->readInt();
+			if (peek <= 100) { contentDis->skip(-4); break; }
+			contentDis->skip(-4);
+
+			wstring sFilename = contentDis->readUTF();
+			int length = contentDis->readInt();
+			byteArray ba( length );
+			contentDis->read(ba);
+			levelGenerator->loadSchematicFile(sFilename, ba.data, ba.length);
+		}
+	}
+	else
+	{
+		for (UINT i = 0; i < numFiles; i++)
+		{
+			wstring sFilename = contentDis->readUTF();
+			int length = contentDis->readInt();
+			byteArray ba( length );
+			contentDis->read(ba);
+			levelGenerator->loadSchematicFile(sFilename, ba.data, ba.length);
+		}
 	}
 
 	LEVEL_GEN_ID lgoID = LEVEL_GEN_ID_NULL;
@@ -521,7 +541,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
 		auto it = tagIdMap.find(tagId);
 		if(it != tagIdMap.end()) tagVal = it->second;
 
-		GameRuleDefinition *rule = NULL;
+		GameRuleDefinition *rule = nullptr;
 
 		if(tagVal == ConsoleGameRules::eGameRuleType_LevelGenerationOptions)
 		{
@@ -548,14 +568,14 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
 	{
 		// Not default
 		contentDis->close();
-		if(contentBais != NULL) delete contentBais;
+		if(contentBais != nullptr) delete contentBais;
 		delete contentDis;
 	}
 
 	dis.close();
 	bais.reset();
 
-	//if(!levelGenAdded) { delete levelGenerator; levelGenerator = NULL; }
+	//if(!levelGenAdded) { delete levelGenerator; levelGenerator = nullptr; }
 	if(!gameRulesAdded) delete gameRules;
 
 	return true;
@@ -583,7 +603,7 @@ void GameRuleManager::readAttributes(DataInputStream *dis, vector<wstring> *tags
 		int attID = dis->readInt();
 		wstring value = dis->readUTF();
 
-		if(rule != NULL) rule->addAttribute(tagsAndAtts->at(attID),value);
+		if(rule != nullptr) rule->addAttribute(tagsAndAtts->at(attID),value);
 	}
 }
 
@@ -597,8 +617,8 @@ void GameRuleManager::readChildren(DataInputStream *dis, vector<wstring> *tagsAn
 		auto it = tagIdMap->find(tagId);
 		if(it != tagIdMap->end()) tagVal = it->second;
 
-		GameRuleDefinition *childRule = NULL;
-		if(rule != NULL) childRule = rule->addChild(tagVal);
+		GameRuleDefinition *childRule = nullptr;
+		if(rule != nullptr) childRule = rule->addChild(tagVal);
 
 		readAttributes(dis,tagsAndAtts,childRule);
 		readChildren(dis,tagsAndAtts,tagIdMap,childRule);
@@ -607,7 +627,7 @@ void GameRuleManager::readChildren(DataInputStream *dis, vector<wstring> *tagsAn
 
 void GameRuleManager::processSchematics(LevelChunk *levelChunk)
 {
-	if(getLevelGenerationOptions() != NULL)
+	if(getLevelGenerationOptions() != nullptr)
 	{
 		LevelGenerationOptions *levelGenOptions = getLevelGenerationOptions();
 		levelGenOptions->processSchematics(levelChunk);
@@ -616,7 +636,7 @@ void GameRuleManager::processSchematics(LevelChunk *levelChunk)
 
 void GameRuleManager::processSchematicsLighting(LevelChunk *levelChunk)
 {
-	if(getLevelGenerationOptions() != NULL)
+	if(getLevelGenerationOptions() != nullptr)
 	{
 		LevelGenerationOptions *levelGenOptions = getLevelGenerationOptions();
 		levelGenOptions->processSchematicsLighting(levelChunk);
@@ -701,21 +721,21 @@ void GameRuleManager::setLevelGenerationOptions(LevelGenerationOptions *levelGen
 {
 	unloadCurrentGameRules();
 
-	m_currentGameRuleDefinitions = NULL;
+	m_currentGameRuleDefinitions = nullptr;
 	m_currentLevelGenerationOptions = levelGen;
 
-	if(m_currentLevelGenerationOptions != NULL && m_currentLevelGenerationOptions->requiresGameRules() )
+	if(m_currentLevelGenerationOptions != nullptr && m_currentLevelGenerationOptions->requiresGameRules() )
 	{
 		m_currentGameRuleDefinitions = m_currentLevelGenerationOptions->getRequiredGameRules();
 	}
 
-	if(m_currentLevelGenerationOptions != NULL)
+	if(m_currentLevelGenerationOptions != nullptr)
 		m_currentLevelGenerationOptions->reset_start();
 }
 
 LPCWSTR	GameRuleManager::GetGameRulesString(const wstring &key)
 {
-	if(m_currentGameRuleDefinitions != NULL && !key.empty() )
+	if(m_currentGameRuleDefinitions != nullptr && !key.empty() )
 	{
 		return m_currentGameRuleDefinitions->getString(key);
 	}
@@ -739,9 +759,9 @@ LEVEL_GEN_ID GameRuleManager::addLevelGenerationOptions(LevelGenerationOptions *
 
 void GameRuleManager::unloadCurrentGameRules()
 {
-	if (m_currentLevelGenerationOptions != NULL)
+	if (m_currentLevelGenerationOptions != nullptr)
 	{
-		if (m_currentGameRuleDefinitions != NULL
+		if (m_currentGameRuleDefinitions != nullptr
 			&& m_currentLevelGenerationOptions->isFromSave())
 				m_levelRules.removeLevelRule( m_currentGameRuleDefinitions );
 
@@ -757,6 +777,6 @@ void GameRuleManager::unloadCurrentGameRules()
 		}
 	}
 
-	m_currentGameRuleDefinitions = NULL;
-	m_currentLevelGenerationOptions = NULL;
+	m_currentGameRuleDefinitions = nullptr;
+	m_currentLevelGenerationOptions = nullptr;
 }
diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.h b/Minecraft.Client/Common/GameRules/GameRuleManager.h
index e9e983b8..3f446e84 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleManager.h
+++ b/Minecraft.Client/Common/GameRules/GameRuleManager.h
@@ -24,8 +24,8 @@ class WstringLookup;
 class GameRuleManager
 {
 public:
-	static WCHAR *wchTagNameA[ConsoleGameRules::eGameRuleType_Count];
-	static WCHAR *wchAttrNameA[ConsoleGameRules::eGameRuleAttr_Count];
+	static const WCHAR *wchTagNameA[ConsoleGameRules::eGameRuleType_Count];
+	static const WCHAR *wchAttrNameA[ConsoleGameRules::eGameRuleAttr_Count];
 
 	static const short version_number = 2;
 
diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
index e49ee293..2af1826c 100644
--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
@@ -44,8 +44,8 @@ bool JustGrSource::ready() { return true; }
 
 LevelGenerationOptions::LevelGenerationOptions(DLCPack *parentPack)
 {
-	m_spawnPos = NULL;
-	m_stringTable = NULL;
+	m_spawnPos = nullptr;
+	m_stringTable = nullptr;
 
 	m_hasLoadedData = false;
 
@@ -56,7 +56,7 @@ LevelGenerationOptions::LevelGenerationOptions(DLCPack *parentPack)
 	m_minY = INT_MAX;
 	m_bRequiresGameRules = false;
 
-	m_pbBaseSaveData = NULL;
+	m_pbBaseSaveData = nullptr;
 	m_dwBaseSaveSize = 0;
 
 	m_parentDLCPack = parentPack;
@@ -66,7 +66,7 @@ LevelGenerationOptions::LevelGenerationOptions(DLCPack *parentPack)
 LevelGenerationOptions::~LevelGenerationOptions()
 {
 	clearSchematics();
-	if(m_spawnPos != NULL) delete m_spawnPos;
+	if(m_spawnPos != nullptr) delete m_spawnPos;
 	for (auto& it : m_schematicRules )
 	{
 		delete it;
@@ -141,26 +141,26 @@ void LevelGenerationOptions::getChildren(vector<GameRuleDefinition *> *children)
 
 GameRuleDefinition *LevelGenerationOptions::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_ApplySchematic)
 	{
 		rule = new ApplySchematicRuleDefinition(this);
-		m_schematicRules.push_back((ApplySchematicRuleDefinition *)rule);
+		m_schematicRules.push_back(static_cast<ApplySchematicRuleDefinition *>(rule));
 	}
 	else if(ruleType == ConsoleGameRules::eGameRuleType_GenerateStructure)
 	{
 		rule = new ConsoleGenerateStructure();
-		m_structureRules.push_back((ConsoleGenerateStructure *)rule);
+		m_structureRules.push_back(static_cast<ConsoleGenerateStructure *>(rule));
 	}
 	else if(ruleType == ConsoleGameRules::eGameRuleType_BiomeOverride)
 	{
 		rule = new BiomeOverride();
-		m_biomeOverrides.push_back((BiomeOverride *)rule);
+		m_biomeOverrides.push_back(static_cast<BiomeOverride *>(rule));
 	}
 	else if(ruleType == ConsoleGameRules::eGameRuleType_StartFeature)
 	{
 		rule = new StartFeature();
-		m_features.push_back((StartFeature *)rule);
+		m_features.push_back(static_cast<StartFeature *>(rule));
 	}
 	else
 	{
@@ -175,26 +175,26 @@ void LevelGenerationOptions::addAttribute(const wstring &attributeName, const ws
 {
 	if(attributeName.compare(L"seed") == 0)
 	{
-		m_seed = _fromString<__int64>(attributeValue);
+		m_seed = _fromString<int64_t>(attributeValue);
 		app.DebugPrintf("LevelGenerationOptions: Adding parameter m_seed=%I64d\n",m_seed);
 	}
 	else if(attributeName.compare(L"spawnX") == 0)
 	{
-		if(m_spawnPos == NULL) m_spawnPos = new Pos();
+		if(m_spawnPos == nullptr) m_spawnPos = new Pos();
 		int value = _fromString<int>(attributeValue);
 		m_spawnPos->x = value;
 		app.DebugPrintf("LevelGenerationOptions: Adding parameter spawnX=%d\n",value);
 	}
 	else if(attributeName.compare(L"spawnY") == 0)
 	{
-		if(m_spawnPos == NULL) m_spawnPos = new Pos();
+		if(m_spawnPos == nullptr) m_spawnPos = new Pos();
 		int value = _fromString<int>(attributeValue);
 		m_spawnPos->y = value;
 		app.DebugPrintf("LevelGenerationOptions: Adding parameter spawnY=%d\n",value);
 	}
 	else if(attributeName.compare(L"spawnZ") == 0)
 	{
-		if(m_spawnPos == NULL) m_spawnPos = new Pos();
+		if(m_spawnPos == nullptr) m_spawnPos = new Pos();
 		int value = _fromString<int>(attributeValue);
 		m_spawnPos->z = value;
 		app.DebugPrintf("LevelGenerationOptions: Adding parameter spawnZ=%d\n",value);
@@ -268,7 +268,7 @@ void LevelGenerationOptions::processSchematics(LevelChunk *chunk)
 		if (structureStart->getBoundingBox()->intersects(cx, cz, cx + 15, cz + 15))
 		{
 			BoundingBox *bb = new BoundingBox(cx, cz, cx + 15, cz + 15);
-			structureStart->postProcess(chunk->level, NULL, bb);
+			structureStart->postProcess(chunk->level, nullptr, bb);
 			delete bb;
 		}
 	}
@@ -353,7 +353,7 @@ ConsoleSchematicFile *LevelGenerationOptions::loadSchematicFile(const wstring &f
 		return it->second;
 	}
 
-	ConsoleSchematicFile *schematic = NULL;
+	ConsoleSchematicFile *schematic = nullptr;
 	byteArray data(pbData,dwLen);
 	ByteArrayInputStream bais(data);
 	DataInputStream dis(&bais);
@@ -366,7 +366,7 @@ ConsoleSchematicFile *LevelGenerationOptions::loadSchematicFile(const wstring &f
 
 ConsoleSchematicFile *LevelGenerationOptions::getSchematicFile(const wstring &filename)
 {
-	ConsoleSchematicFile *schematic = NULL;
+	ConsoleSchematicFile *schematic = nullptr;
 	// If we have already loaded this, just return
 	auto it = m_schematics.find(filename);
 	if(it != m_schematics.end())
@@ -399,7 +399,7 @@ void LevelGenerationOptions::loadStringTable(StringTable *table)
 
 LPCWSTR LevelGenerationOptions::getString(const wstring &key)
 {
-	if(m_stringTable == NULL)
+	if(m_stringTable == nullptr)
 	{
 		return L"";
 	}
@@ -455,8 +455,76 @@ unordered_map<wstring, ConsoleSchematicFile *> *LevelGenerationOptions::getUnfin
 
 void LevelGenerationOptions::loadBaseSaveData()
 {
+#ifdef _WINDOWS64
+	
+	int gameRulesCount = m_parentDLCPack ? m_parentDLCPack->getDLCItemsCount(DLCManager::e_DLCType_GameRulesHeader) : 0;
+
+	wstring baseSave = getBaseSavePath();
+	wstring packName = baseSave.substr(0, baseSave.find(L'.'));
+
+	for (int i = 0; i < gameRulesCount; ++i)
+	{
+		DLCGameRulesHeader* dlcFile = static_cast<DLCGameRulesHeader*>(m_parentDLCPack->getFile(DLCManager::e_DLCType_GameRulesHeader, i));
+
+		if (!dlcFile->getGrfPath().empty())
+		{
+			File grf(L"Windows64Media\\DLC\\" + packName + L"\\Data\\" + dlcFile->getGrfPath());
+
+			if (grf.exists())
+			{
+				wstring path = grf.getPath();
+				HANDLE fileHandle = CreateFileW(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
+
+				if (fileHandle != INVALID_HANDLE_VALUE)
+				{
+					DWORD dwFileSize = grf.length();
+					DWORD bytesRead;
+					PBYTE pbData = new BYTE[dwFileSize];
+					BOOL bSuccess = ReadFile(fileHandle, pbData, dwFileSize, &bytesRead, nullptr);
+					CloseHandle(fileHandle);
+
+					if (bSuccess)
+					{
+						dlcFile->setGrfData(pbData, dwFileSize, m_stringTable);
+						app.m_gameRules.setLevelGenerationOptions(dlcFile->lgo);
+					}
+					delete[] pbData;
+				}
+			}
+		}
+	}
+
+	if (requiresBaseSave() && !getBaseSavePath().empty())
+	{
+		File save(L"Windows64Media\\DLC\\" + packName + L"\\Data\\" + baseSave);
+
+		if (save.exists())
+		{
+			wstring path = save.getPath();
+			HANDLE fileHandle = CreateFileW(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
+
+			if (fileHandle != INVALID_HANDLE_VALUE)
+			{
+				DWORD dwFileSize = GetFileSize(fileHandle, nullptr);
+				DWORD bytesRead;
+				PBYTE pbData = new BYTE[dwFileSize];
+				BOOL bSuccess = ReadFile(fileHandle, pbData, dwFileSize, &bytesRead, nullptr);
+				CloseHandle(fileHandle);
+
+				if (bSuccess)
+					setBaseSaveData(pbData, dwFileSize);
+				else
+					delete[] pbData;
+			}
+		}
+	}
+
+	setLoadedData();
+	app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ReloadTexturePack);
+
+#else
 	int mountIndex = -1;
-	if(m_parentDLCPack != NULL) mountIndex = m_parentDLCPack->GetDLCMountIndex();
+	if(m_parentDLCPack != nullptr) mountIndex = m_parentDLCPack->GetDLCMountIndex();
 
 	if(mountIndex > -1)
 	{
@@ -481,11 +549,12 @@ void LevelGenerationOptions::loadBaseSaveData()
 		setLoadedData();
 		app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ReloadTexturePack);
 	}
+#endif
 }
 
 int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD dwLicenceMask)
 {
-	LevelGenerationOptions *lgo = (LevelGenerationOptions *)pParam;
+	LevelGenerationOptions *lgo = static_cast<LevelGenerationOptions *>(pParam);
 	lgo->m_bLoadingData = false;
 	if(dwErr!=ERROR_SUCCESS)
 	{
@@ -499,7 +568,7 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 		int gameRulesCount = lgo->m_parentDLCPack->getDLCItemsCount(DLCManager::e_DLCType_GameRulesHeader);
 		for(int i = 0; i < gameRulesCount; ++i)
 		{
-			DLCGameRulesHeader *dlcFile = (DLCGameRulesHeader *) lgo->m_parentDLCPack->getFile(DLCManager::e_DLCType_GameRulesHeader, i);
+			DLCGameRulesHeader *dlcFile = static_cast<DLCGameRulesHeader *>(lgo->m_parentDLCPack->getFile(DLCManager::e_DLCType_GameRulesHeader, i));
 
 			if (!dlcFile->getGrfPath().empty())
 			{
@@ -513,10 +582,10 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 						pchFilename, // file name
 						GENERIC_READ, // access mode
 						0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
-						NULL, // Unused
+						nullptr, // Unused
 						OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
 						FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
-						NULL // Unsupported
+						nullptr // Unsupported
 						);
 #else
 					const char *pchFilename=wstringtofilename(grf.getPath());
@@ -524,10 +593,10 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 						pchFilename, // file name
 						GENERIC_READ, // access mode
 						0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
-						NULL, // Unused
+						nullptr, // Unused
 						OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
 						FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
-						NULL // Unsupported
+						nullptr // Unsupported
 						);
 #endif
 
@@ -536,7 +605,7 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 						DWORD dwFileSize = grf.length();
 						DWORD bytesRead;
 						PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
-						BOOL bSuccess = ReadFile(fileHandle,pbData,dwFileSize,&bytesRead,NULL);
+						BOOL bSuccess = ReadFile(fileHandle,pbData,dwFileSize,&bytesRead,nullptr);
 						if(bSuccess==FALSE)
 						{
 							app.FatalLoadError();
@@ -565,10 +634,10 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 					pchFilename, // file name
 					GENERIC_READ, // access mode
 					0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
-					NULL, // Unused
+					nullptr, // Unused
 					OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
 					FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
-					NULL // Unsupported
+					nullptr // Unsupported
 					);
 #else
 				const char *pchFilename=wstringtofilename(save.getPath());
@@ -576,18 +645,18 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 					pchFilename, // file name
 					GENERIC_READ, // access mode
 					0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
-					NULL, // Unused
+					nullptr, // Unused
 					OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
 					FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
-					NULL // Unsupported
+					nullptr // Unsupported
 					);
 #endif
 
 				if( fileHandle != INVALID_HANDLE_VALUE )
 				{
-					DWORD bytesRead,dwFileSize = GetFileSize(fileHandle,NULL);
+					DWORD bytesRead,dwFileSize = GetFileSize(fileHandle,nullptr);
 					PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
-					BOOL bSuccess = ReadFile(fileHandle,pbData,dwFileSize,&bytesRead,NULL);
+					BOOL bSuccess = ReadFile(fileHandle,pbData,dwFileSize,&bytesRead,nullptr);
 					if(bSuccess==FALSE)
 					{
 						app.FatalLoadError();
@@ -624,8 +693,8 @@ void LevelGenerationOptions::reset_start()
 
 void LevelGenerationOptions::reset_finish()
 {
-	//if (m_spawnPos)				{ delete m_spawnPos; m_spawnPos = NULL; }
-	//if (m_stringTable)			{ delete m_stringTable; m_stringTable = NULL; }
+	//if (m_spawnPos)				{ delete m_spawnPos; m_spawnPos = nullptr; }
+	//if (m_stringTable)			{ delete m_stringTable; m_stringTable = nullptr; }
 
 	if (isFromDLC())
 	{
@@ -694,13 +763,13 @@ bool LevelGenerationOptions::ready() { return info()->ready(); }
 
 void LevelGenerationOptions::setBaseSaveData(PBYTE pbData, DWORD dwSize) { m_pbBaseSaveData = pbData; m_dwBaseSaveSize = dwSize; }
 PBYTE LevelGenerationOptions::getBaseSaveData(DWORD &size) { size = m_dwBaseSaveSize; return m_pbBaseSaveData; }
-bool LevelGenerationOptions::hasBaseSaveData() { return m_dwBaseSaveSize > 0 && m_pbBaseSaveData != NULL; }
-void LevelGenerationOptions::deleteBaseSaveData() { if(m_pbBaseSaveData) delete m_pbBaseSaveData; m_pbBaseSaveData = NULL; m_dwBaseSaveSize = 0; }
+bool LevelGenerationOptions::hasBaseSaveData() { return m_dwBaseSaveSize > 0 && m_pbBaseSaveData != nullptr; }
+void LevelGenerationOptions::deleteBaseSaveData() { if(m_pbBaseSaveData) delete m_pbBaseSaveData; m_pbBaseSaveData = nullptr; m_dwBaseSaveSize = 0; }
 
 bool LevelGenerationOptions::hasLoadedData() { return m_hasLoadedData; }
 void LevelGenerationOptions::setLoadedData() { m_hasLoadedData = true; }
 
-__int64 LevelGenerationOptions::getLevelSeed() { return m_seed; }
+int64_t LevelGenerationOptions::getLevelSeed() { return m_seed; }
 int LevelGenerationOptions::getLevelHasBeenInCreative() { return m_bHasBeenInCreative; }
 Pos *LevelGenerationOptions::getSpawnPos() { return m_spawnPos; }
 bool LevelGenerationOptions::getuseFlatWorld() { return m_useFlatWorld; }
diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
index aa128ff8..378ac6c5 100644
--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
@@ -19,7 +19,7 @@ class GrSource
 public:
 	// 4J-JEV:
 	// Moved all this here; I didn't like that all this header information
-	// was being mixed in with all the game information as they have 
+	// was being mixed in with all the game information as they have
 	// completely different lifespans.
 
 	virtual bool requiresTexturePack()=0;
@@ -146,7 +146,7 @@ public:
 
 private:
 	// This should match the "MapOptionsRule" definition in the XML schema
-	__int64 m_seed;
+	int64_t m_seed;
 	bool m_useFlatWorld;
 	Pos *m_spawnPos;
 	int m_bHasBeenInCreative;
@@ -167,17 +167,17 @@ private:
 	bool m_bLoadingData;
 
 public:
-	LevelGenerationOptions(DLCPack *parentPack = NULL);
+	LevelGenerationOptions(DLCPack *parentPack = nullptr);
 	~LevelGenerationOptions();
 
 	virtual ConsoleGameRules::EGameRuleType getActionType();
-	
+
 	virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes);
 	virtual void getChildren(vector<GameRuleDefinition *> *children);
 	virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType);
 	virtual void addAttribute(const wstring &attributeName, const wstring &attributeValue);
 
-	__int64 getLevelSeed();
+	int64_t getLevelSeed();
 	int getLevelHasBeenInCreative();
 	Pos *getSpawnPos();
 	bool getuseFlatWorld();
@@ -190,7 +190,7 @@ public:
 private:
 	void clearSchematics();
 
-public:	
+public:
 	ConsoleSchematicFile *loadSchematicFile(const wstring &filename, PBYTE pbData, DWORD dwLen);
 
 public:
@@ -202,7 +202,7 @@ public:
 	LevelRuleset *getRequiredGameRules();
 
 	void getBiomeOverride(int biomeId, BYTE &tile, BYTE &topTile);
-	bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature, int *orientation = NULL);
+	bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature, int *orientation = nullptr);
 
 	void loadStringTable(StringTable *table);
 	LPCWSTR getString(const wstring &key);
@@ -211,7 +211,7 @@ public:
 
 	void loadBaseSaveData();
 	static int packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD dwLicenceMask);
-	
+
 	// 4J-JEV:
 	// ApplySchematicRules contain limited state
 	// which needs to be reset BEFORE a new game starts.
diff --git a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
index 658abe91..de17bacc 100644
--- a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
@@ -6,7 +6,7 @@
 
 LevelRuleset::LevelRuleset()
 {
-	m_stringTable = NULL;
+	m_stringTable = nullptr;
 }
 
 LevelRuleset::~LevelRuleset()
@@ -26,11 +26,11 @@ void LevelRuleset::getChildren(vector<GameRuleDefinition *> *children)
 
 GameRuleDefinition *LevelRuleset::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_NamedArea)
 	{
 		rule = new NamedAreaRuleDefinition();
-		m_areas.push_back((NamedAreaRuleDefinition *)rule);
+		m_areas.push_back(static_cast<NamedAreaRuleDefinition *>(rule));
 	}
 	else
 	{
@@ -46,7 +46,7 @@ void LevelRuleset::loadStringTable(StringTable *table)
 
 LPCWSTR LevelRuleset::getString(const wstring &key)
 {
-	if(m_stringTable == NULL)
+	if(m_stringTable == nullptr)
 	{
 		return L"";
 	}
diff --git a/Minecraft.Client/Common/GameRules/StartFeature.cpp b/Minecraft.Client/Common/GameRules/StartFeature.cpp
index 904bce73..14b6d9c9 100644
--- a/Minecraft.Client/Common/GameRules/StartFeature.cpp
+++ b/Minecraft.Client/Common/GameRules/StartFeature.cpp
@@ -47,7 +47,7 @@ void StartFeature::addAttribute(const wstring &attributeName, const wstring &att
 	else if(attributeName.compare(L"feature") == 0)
 	{
 		int value = _fromString<int>(attributeValue);
-		m_feature = (StructureFeature::EFeatureTypes)value;
+		m_feature = static_cast<StructureFeature::EFeatureTypes>(value);
 		app.DebugPrintf("StartFeature: Adding parameter feature=%d\n",m_feature);
 	}
 	else
@@ -58,6 +58,6 @@ void StartFeature::addAttribute(const wstring &attributeName, const wstring &att
 
 bool StartFeature::isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature, int *orientation)
 {
-	if(orientation != NULL) *orientation = m_orientation;
+	if(orientation != nullptr) *orientation = m_orientation;
 	return chunkX == m_chunkX && chunkZ == m_chunkZ && feature == m_feature;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
index ec218c7a..99aee99b 100644
--- a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
@@ -12,7 +12,7 @@ UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
 	m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;;
 	m_health = 0;
 	m_food = 0;
-	m_spawnPos = NULL;
+	m_spawnPos = nullptr;
 	m_yRot = 0.0f;
 }
 
@@ -65,11 +65,11 @@ void UpdatePlayerRuleDefinition::getChildren(vector<GameRuleDefinition *> *child
 
 GameRuleDefinition *UpdatePlayerRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_AddItem)
 	{
 		rule = new AddItemRuleDefinition();
-		m_items.push_back((AddItemRuleDefinition *)rule);
+		m_items.push_back(static_cast<AddItemRuleDefinition *>(rule));
 	}
 	else
 	{
@@ -84,21 +84,21 @@ void UpdatePlayerRuleDefinition::addAttribute(const wstring &attributeName, cons
 {
 	if(attributeName.compare(L"spawnX") == 0)
 	{
-		if(m_spawnPos == NULL) m_spawnPos = new Pos();
+		if(m_spawnPos == nullptr) m_spawnPos = new Pos();
 		int value = _fromString<int>(attributeValue);
 		m_spawnPos->x = value;
 		app.DebugPrintf("UpdatePlayerRuleDefinition: Adding parameter spawnX=%d\n",value);
 	}
 	else if(attributeName.compare(L"spawnY") == 0)
 	{
-		if(m_spawnPos == NULL) m_spawnPos = new Pos();
+		if(m_spawnPos == nullptr) m_spawnPos = new Pos();
 		int value = _fromString<int>(attributeValue);
 		m_spawnPos->y = value;
 		app.DebugPrintf("UpdatePlayerRuleDefinition: Adding parameter spawnY=%d\n",value);
 	}
 	else if(attributeName.compare(L"spawnZ") == 0)
 	{
-		if(m_spawnPos == NULL) m_spawnPos = new Pos();
+		if(m_spawnPos == nullptr) m_spawnPos = new Pos();
 		int value = _fromString<int>(attributeValue);
 		m_spawnPos->z = value;
 		app.DebugPrintf("UpdatePlayerRuleDefinition: Adding parameter spawnZ=%d\n",value);
@@ -148,7 +148,7 @@ void UpdatePlayerRuleDefinition::postProcessPlayer(shared_ptr<Player> player)
 	double z = player->z;
 	float yRot = player->yRot;
 	float xRot = player->xRot;
-	if(m_spawnPos != NULL)
+	if(m_spawnPos != nullptr)
 	{
 		x = m_spawnPos->x;
 		y = m_spawnPos->y;
@@ -160,7 +160,7 @@ void UpdatePlayerRuleDefinition::postProcessPlayer(shared_ptr<Player> player)
 		yRot = m_yRot;
 	}
 
-	if(m_spawnPos != NULL || m_bUpdateYRot) player->absMoveTo(x,y,z,yRot,xRot);
+	if(m_spawnPos != nullptr || m_bUpdateYRot) player->absMoveTo(x,y,z,yRot,xRot);
 
 	for(auto& addItem : m_items)
 	{
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
index fa68ef6a..1f494691 100644
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
@@ -33,11 +33,11 @@ void XboxStructureActionPlaceContainer::getChildren(vector<GameRuleDefinition *>
 
 GameRuleDefinition *XboxStructureActionPlaceContainer::addChild(ConsoleGameRules::EGameRuleType ruleType)
 {
-	GameRuleDefinition *rule = NULL;
+	GameRuleDefinition *rule = nullptr;
 	if(ruleType == ConsoleGameRules::eGameRuleType_AddItem)
 	{
 		rule = new AddItemRuleDefinition();
-		m_items.push_back((AddItemRuleDefinition *)rule);
+		m_items.push_back(static_cast<AddItemRuleDefinition *>(rule));
 	}
 	else
 	{
@@ -70,7 +70,7 @@ bool XboxStructureActionPlaceContainer::placeContainerInLevel(StructurePiece *st
 
 	if ( chunkBB->isInside( worldX, worldY, worldZ ) )
 	{
-		if ( level->getTileEntity( worldX, worldY, worldZ ) != NULL )
+		if ( level->getTileEntity( worldX, worldY, worldZ ) != nullptr )
 		{
 			// Remove the current tile entity
 			level->removeTileEntity( worldX, worldY, worldZ );
@@ -81,7 +81,7 @@ bool XboxStructureActionPlaceContainer::placeContainerInLevel(StructurePiece *st
 		shared_ptr<Container> container = dynamic_pointer_cast<Container>(level->getTileEntity( worldX, worldY, worldZ ));
 
 		app.DebugPrintf("XboxStructureActionPlaceContainer - placing a container at (%d,%d,%d)\n", worldX, worldY, worldZ);
-		if ( container != NULL )
+		if ( container != nullptr )
 		{
 			level->setData( worldX, worldY, worldZ, m_data, Tile::UPDATE_CLIENTS);
 			// Add items
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
index 3f6204af..3e61154f 100644
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
@@ -46,7 +46,7 @@ bool XboxStructureActionPlaceSpawner::placeSpawnerInLevel(StructurePiece *struct
 
 	if ( chunkBB->isInside( worldX, worldY, worldZ ) )
 	{
-		if ( level->getTileEntity( worldX, worldY, worldZ ) != NULL )
+		if ( level->getTileEntity( worldX, worldY, worldZ ) != nullptr )
 		{
 			// Remove the current tile entity
 			level->removeTileEntity( worldX, worldY, worldZ );
@@ -59,7 +59,7 @@ bool XboxStructureActionPlaceSpawner::placeSpawnerInLevel(StructurePiece *struct
 #ifndef _CONTENT_PACKAGE
 		wprintf(L"XboxStructureActionPlaceSpawner - placing a %ls spawner at (%d,%d,%d)\n", m_entityId.c_str(), worldX, worldY, worldZ);
 #endif
-		if( entity != NULL )
+		if( entity != nullptr )
 		{
 			entity->setEntityId(m_entityId);
 		}
diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardInterface.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardInterface.cpp
index 07463517..06f9a69b 100644
--- a/Minecraft.Client/Common/Leaderboards/LeaderboardInterface.cpp
+++ b/Minecraft.Client/Common/Leaderboards/LeaderboardInterface.cpp
@@ -6,8 +6,8 @@ LeaderboardInterface::LeaderboardInterface(LeaderboardManager *man)
 	m_manager = man;
 	m_pending = false;
 
-	m_filter = (LeaderboardManager::EFilterMode) -1;
-	m_callback = NULL;
+	m_filter = static_cast<LeaderboardManager::EFilterMode>(-1);
+	m_callback = nullptr;
 	m_difficulty = 0;
 	m_type = LeaderboardManager::eStatsType_UNDEFINED;
 	m_startIndex = 0;
diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
index 33707b14..2ba1efd6 100644
--- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
@@ -12,7 +12,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 void LeaderboardManager::DeleteInstance()
 {
 	delete m_instance;
-	m_instance = NULL;
+	m_instance = nullptr;
 }
 
 LeaderboardManager::LeaderboardManager()
@@ -26,7 +26,7 @@ void LeaderboardManager::zeroReadParameters()
 {
 	m_difficulty = -1;
 	m_statsType = eStatsType_UNDEFINED;
-	m_readListener = NULL;
+	m_readListener = nullptr;
 	m_startIndex = 0;
 	m_readCount = 0;
 	m_eFilterMode = eFM_UNDEFINED;
diff --git a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
index 78d62568..f2d48947 100644
--- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
@@ -35,7 +35,7 @@ SonyLeaderboardManager::SonyLeaderboardManager()
 
 	m_myXUID = INVALID_XUID;
 
-	m_scores = NULL;
+	m_scores = nullptr;
 
 	m_statsType = eStatsType_Kills;
 	m_difficulty = 0;
@@ -47,7 +47,7 @@ SonyLeaderboardManager::SonyLeaderboardManager()
 	InitializeCriticalSection(&m_csViewsLock);
 
 	m_running = false;
-	m_threadScoreboard = NULL;
+	m_threadScoreboard = nullptr;
 }
 
 SonyLeaderboardManager::~SonyLeaderboardManager()
@@ -288,7 +288,7 @@ bool SonyLeaderboardManager::getScoreByIds()
 	SonyRtcTick last_sort_date;
 	SceNpScoreRankNumber mTotalRecord;
 
-	SceNpId *npIds = NULL;
+	SceNpId *npIds = nullptr;
 	
 	int ret;
 	uint32_t num = 0;
@@ -322,7 +322,7 @@ bool SonyLeaderboardManager::getScoreByIds()
 	ZeroMemory(comments, sizeof(SceNpScoreComment) * num);
 
 	/* app.DebugPrintf("sceNpScoreGetRankingByNpId(\n\t transaction=%i,\n\t boardID=0,\n\t npId=%i,\n\t friendCount*sizeof(SceNpId)=%i*%i=%i,\
-	rankData=%i,\n\t friendCount*sizeof(SceNpScorePlayerRankData)=%i,\n\t NULL, 0, NULL, 0,\n\t friendCount=%i,\n...\n",
+	rankData=%i,\n\t friendCount*sizeof(SceNpScorePlayerRankData)=%i,\n\t nullptr, 0, nullptr, 0,\n\t friendCount=%i,\n...\n",
 	transaction, npId, friendCount, sizeof(SceNpId), friendCount*sizeof(SceNpId),
 	rankData, friendCount*sizeof(SceNpScorePlayerRankData), friendCount
 	); */
@@ -342,9 +342,9 @@ bool SonyLeaderboardManager::getScoreByIds()
 
 			destroyTransactionContext(ret);
 
-			if (npIds		!= NULL)	delete [] npIds;
-			if (ptr			!= NULL)	delete [] ptr;
-			if (comments	!= NULL)	delete [] comments;
+			if (npIds		!= nullptr)	delete [] npIds;
+			if (ptr			!= nullptr)	delete [] ptr;
+			if (comments	!= nullptr)	delete [] comments;
 
 			return false;
 		}
@@ -355,9 +355,9 @@ bool SonyLeaderboardManager::getScoreByIds()
 
 			m_eStatsState = eStatsState_Failed;
 
-			if (npIds		!= NULL)	delete [] npIds;
-			if (ptr			!= NULL)	delete [] ptr;
-			if (comments	!= NULL)	delete [] comments;
+			if (npIds		!= nullptr)	delete [] npIds;
+			if (ptr			!= nullptr)	delete [] ptr;
+			if (comments	!= nullptr)	delete [] comments;
 
 			return false;
 		}
@@ -387,14 +387,14 @@ bool SonyLeaderboardManager::getScoreByIds()
 			comments,	sizeof(SceNpScoreComment) * tmpNum,			//OUT: Comments
 #endif
 
-			NULL, 0, // GameData. (unused)
+			nullptr, 0, // GameData. (unused)
 
 			tmpNum,
 
 			&last_sort_date,
 			&mTotalRecord,
 
-			NULL // Reserved, specify null.
+			nullptr // Reserved, specify null.
 			);
 
 		if (ret == SCE_NP_COMMUNITY_ERROR_ABORTED)
@@ -425,7 +425,7 @@ bool SonyLeaderboardManager::getScoreByIds()
 	m_readCount = num;
 
 	// Filter scorers and construct output structure.
-	if (m_scores != NULL) delete [] m_scores;
+	if (m_scores != nullptr) delete [] m_scores;
 	m_scores = new ReadScore[m_readCount];
 	convertToOutput(m_readCount, m_scores, ptr, comments);
 	m_maxRank = m_readCount;
@@ -458,7 +458,7 @@ error3:
 	delete [] ptr;
 	delete [] comments;
 error2:
-	if (npIds != NULL) delete [] npIds;
+	if (npIds != nullptr) delete [] npIds;
 error1:
 	if (m_eStatsState != eStatsState_Canceled) m_eStatsState = eStatsState_Failed;
 	app.DebugPrintf("[SonyLeaderboardManager] getScoreByIds() FAILED, ret=0x%X\n", ret);
@@ -511,14 +511,14 @@ bool SonyLeaderboardManager::getScoreByRange()
 
 		comments, sizeof(SceNpScoreComment) * num, //OUT: Comment Data
 
-		NULL, 0, // GameData.
+		nullptr, 0, // GameData.
 
 		num,
 
 		&last_sort_date,
 		&m_maxRank,		// 'Total number of players registered in the target scoreboard.'
 
-		NULL // Reserved, specify null.
+		nullptr // Reserved, specify null.
 		);
 
 	if (ret == SCE_NP_COMMUNITY_ERROR_ABORTED)
@@ -539,7 +539,7 @@ bool SonyLeaderboardManager::getScoreByRange()
 		delete [] ptr;
 		delete [] comments;
 
-		m_scores = NULL;
+		m_scores = nullptr;
 		m_readCount = 0;
 
 		m_eStatsState = eStatsState_Ready;
@@ -557,7 +557,7 @@ bool SonyLeaderboardManager::getScoreByRange()
 
 	//m_stats = ptr; //Maybe: addPadding(num,ptr);
 
-	if (m_scores != NULL) delete [] m_scores;
+	if (m_scores != nullptr) delete [] m_scores;
 	m_readCount = ret;
 	m_scores = new ReadScore[m_readCount];
 	for (int i=0; i<m_readCount; i++)
@@ -642,15 +642,15 @@ bool SonyLeaderboardManager::setScore()
 		rscore.m_score,		//IN: new score,
 
 		&comment,	// Comments
-		NULL,		// GameInfo
+		nullptr,		// GameInfo
 
 		&tmp,		//OUT: current rank,
 
 #ifndef __PS3__
-		NULL,		//compareDate 
+		nullptr,		//compareDate 
 #endif
 
-		NULL // Reserved, specify null.
+		nullptr // Reserved, specify null.
 		);
 
 	if (ret==SCE_NP_COMMUNITY_SERVER_ERROR_NOT_BEST_SCORE) //0x8002A415
@@ -695,7 +695,7 @@ void SonyLeaderboardManager::Tick()
 	{
 	case eStatsState_Ready:
 		{		
-			assert(m_scores != NULL || m_readCount == 0);
+			assert(m_scores != nullptr || m_readCount == 0);
 
 			view.m_numQueries = m_readCount;
 			view.m_queries = m_scores;
@@ -707,7 +707,7 @@ void SonyLeaderboardManager::Tick()
 			if (view.m_numQueries > 0)
 				ret = eStatsReturn_Success;
 
-			if (m_readListener != NULL)
+			if (m_readListener != nullptr)
 			{
 				app.DebugPrintf("[SonyLeaderboardManager] OnStatsReadComplete(%i, %i, _), m_readCount=%i.\n", ret, m_maxRank, m_readCount);
 				m_readListener->OnStatsReadComplete(ret, m_maxRank, view);
@@ -716,16 +716,16 @@ void SonyLeaderboardManager::Tick()
 			m_eStatsState = eStatsState_Idle;
 
 			delete [] m_scores;
-			m_scores = NULL;
+			m_scores = nullptr;
 		}
 		break;
 
 	case eStatsState_Failed:
 		{
 			view.m_numQueries = 0;
-			view.m_queries = NULL;
+			view.m_queries = nullptr;
 
-			if ( m_readListener != NULL )
+			if ( m_readListener != nullptr )
 				m_readListener->OnStatsReadComplete(eStatsReturn_NetworkError, 0, view);
 
 			m_eStatsState = eStatsState_Idle;
@@ -747,7 +747,7 @@ bool SonyLeaderboardManager::OpenSession()
 {
 	if (m_openSessions == 0)
 	{
-		if (m_threadScoreboard == NULL)
+		if (m_threadScoreboard == nullptr)
 		{
 			m_threadScoreboard = new C4JThread(&scoreboardThreadEntry, this, "4JScoreboard");
 			m_threadScoreboard->SetProcessor(CPU_CORE_LEADERBOARDS);
@@ -837,7 +837,7 @@ void SonyLeaderboardManager::FlushStats() {}
 
 void SonyLeaderboardManager::CancelOperation()
 {
-	m_readListener = NULL;
+	m_readListener = nullptr;
 	m_eStatsState = eStatsState_Canceled;
 
 	if (m_requestId != 0)
@@ -980,7 +980,7 @@ void SonyLeaderboardManager::fromBase32(void *out, SceNpScoreComment *in)
 	for (int i = 0; i < SCE_NP_SCORE_COMMENT_MAXLEN; i++)
 	{
 		ch[0] = getComment(in)[i];
-		unsigned char fivebits = strtol(ch, NULL, 32) << 3;
+		unsigned char fivebits = strtol(ch, nullptr, 32) << 3;
 
 		int sByte = (i*5) / 8;
 		int eByte = (5+(i*5)) / 8;
@@ -1041,7 +1041,7 @@ bool SonyLeaderboardManager::test_string(string testing)
 	int ctx = createTransactionContext(m_titleContext);
 	if (ctx<0) return false;
 
-	int ret = sceNpScoreCensorComment(ctx, (const char *) &comment, NULL);
+	int ret = sceNpScoreCensorComment(ctx, (const char *) &comment, nullptr);
 
 	if (ret == SCE_NP_COMMUNITY_SERVER_ERROR_CENSORED)
 	{
diff --git a/Minecraft.Client/Common/Media/Intro1080.swf b/Minecraft.Client/Common/Media/Intro1080.swf
index c9f2d3ba..e0a90a57 100644
--- a/Minecraft.Client/Common/Media/Intro1080.swf
+++ b/Minecraft.Client/Common/Media/Intro1080.swf
diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc
index 4c17b74b..4d099532 100644
--- a/Minecraft.Client/Common/Media/MediaWindows64.arc
+++ b/Minecraft.Client/Common/Media/MediaWindows64.arc
diff --git a/Minecraft.Client/Common/Media/SettingsGraphicsMenu1080.swf b/Minecraft.Client/Common/Media/SettingsGraphicsMenu1080.swf
index 3a48abc9..2495b434 100644
--- a/Minecraft.Client/Common/Media/SettingsGraphicsMenu1080.swf
+++ b/Minecraft.Client/Common/Media/SettingsGraphicsMenu1080.swf
diff --git a/Minecraft.Client/Common/Media/SettingsGraphicsMenu480.swf b/Minecraft.Client/Common/Media/SettingsGraphicsMenu480.swf
index 4fb884a9..aae01e78 100644
--- a/Minecraft.Client/Common/Media/SettingsGraphicsMenu480.swf
+++ b/Minecraft.Client/Common/Media/SettingsGraphicsMenu480.swf
diff --git a/Minecraft.Client/Common/Media/SettingsGraphicsMenu720.swf b/Minecraft.Client/Common/Media/SettingsGraphicsMenu720.swf
index 94996803..4e860fb1 100644
--- a/Minecraft.Client/Common/Media/SettingsGraphicsMenu720.swf
+++ b/Minecraft.Client/Common/Media/SettingsGraphicsMenu720.swf
diff --git a/Minecraft.Client/Common/Media/SettingsGraphicsMenuVita.swf b/Minecraft.Client/Common/Media/SettingsGraphicsMenuVita.swf
index 5e937d4d..f7f5644a 100644
--- a/Minecraft.Client/Common/Media/SettingsGraphicsMenuVita.swf
+++ b/Minecraft.Client/Common/Media/SettingsGraphicsMenuVita.swf
diff --git a/Minecraft.Client/Common/Media/languages.loc b/Minecraft.Client/Common/Media/languages.loc
index c267b1ac..3fb5b1a0 100644
--- a/Minecraft.Client/Common/Media/languages.loc
+++ b/Minecraft.Client/Common/Media/languages.loc
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
index dbae3010..50aeae68 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
@@ -41,12 +41,17 @@
 #include "..\Minecraft.World\DurangoStats.h"
 #endif
 
+#ifdef _WINDOWS64
+#include "..\..\Windows64\Network\WinsockNetLayer.h"
+#include "..\..\Windows64\Windows64_Xuid.h"
+#endif
+
 // Global instance
 CGameNetworkManager g_NetworkManager;
 CPlatformNetworkManager *CGameNetworkManager::s_pPlatformNetworkManager;
 
-__int64 CGameNetworkManager::messageQueue[512];
-__int64 CGameNetworkManager::byteQueue[512];
+int64_t CGameNetworkManager::messageQueue[512];
+int64_t CGameNetworkManager::byteQueue[512];
 int CGameNetworkManager::messageQueuePos = 0;
 
 CGameNetworkManager::CGameNetworkManager()
@@ -56,8 +61,8 @@ CGameNetworkManager::CGameNetworkManager()
 	m_bFullSessionMessageOnNextSessionChange = false;
 
 #ifdef __ORBIS__
-	m_pUpsell = NULL;
-	m_pInviteInfo = NULL;
+	m_pUpsell = nullptr;
+	m_pInviteInfo = nullptr;
 #endif
 }
 
@@ -120,26 +125,26 @@ void CGameNetworkManager::DoWork()
 	s_pPlatformNetworkManager->DoWork();
 
 #ifdef __ORBIS__
-	if (m_pUpsell != NULL && m_pUpsell->hasResponse())
+	if (m_pUpsell != nullptr && m_pUpsell->hasResponse())
 	{
 		int iPad_invited = m_iPlayerInvited, iPad_checking = m_pUpsell->m_userIndex;
 
 		m_iPlayerInvited = -1;
 
 		delete m_pUpsell;
-		m_pUpsell = NULL;
+		m_pUpsell = nullptr;
 
 		if (ProfileManager.HasPlayStationPlus(iPad_checking))
 		{
 			this->GameInviteReceived(iPad_invited, m_pInviteInfo);
 
 			// m_pInviteInfo deleted by GameInviteReceived.
-			m_pInviteInfo = NULL;
+			m_pInviteInfo = nullptr;
 		}
 		else
 		{
 			delete m_pInviteInfo;
-			m_pInviteInfo = NULL;
+			m_pInviteInfo = nullptr;
 		}
 	}
 #endif
@@ -194,16 +199,18 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 	ProfileManager.SetDeferredSignoutEnabled(true);
 #endif
 
-	__int64 seed = 0;
-	if(lpParameter != NULL)
+    int64_t seed = 0;
+	bool dedicatedNoLocalHostPlayer = false;
+    if (lpParameter != nullptr)
 	{
-		NetworkGameInitData *param = (NetworkGameInitData *)lpParameter;
+		NetworkGameInitData *param = static_cast<NetworkGameInitData *>(lpParameter);
 		seed = param->seed;
+		dedicatedNoLocalHostPlayer = param->dedicatedNoLocalHostPlayer;
 
 		app.setLevelGenerationOptions(param->levelGen);
-		if(param->levelGen != NULL)
+		if(param->levelGen != nullptr)
 		{
-			if(app.getLevelGenerationOptions() == NULL)
+			if(app.getLevelGenerationOptions() == nullptr)
 			{
 				app.DebugPrintf("Game rule was not loaded, and seed is required. Exiting.\n");
 				return false;
@@ -248,10 +255,10 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 								pchFilename, // file name
 								GENERIC_READ, // access mode
 								0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
-								NULL, // Unused
+								nullptr, // Unused
 								OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
 								FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
-								NULL // Unsupported
+								nullptr // Unsupported
 								);
 #else
 							const char *pchFilename=wstringtofilename(grf.getPath());
@@ -259,18 +266,18 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 								pchFilename, // file name
 								GENERIC_READ, // access mode
 								0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
-								NULL, // Unused
+								nullptr, // Unused
 								OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
 								FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
-								NULL // Unsupported
+								nullptr // Unsupported
 								);
 #endif
 
 							if( fileHandle != INVALID_HANDLE_VALUE )
 							{
-								DWORD bytesRead,dwFileSize = GetFileSize(fileHandle,NULL);
+								DWORD bytesRead,dwFileSize = GetFileSize(fileHandle,nullptr);
 								PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
-								BOOL bSuccess = ReadFile(fileHandle,pbData,dwFileSize,&bytesRead,NULL);
+								BOOL bSuccess = ReadFile(fileHandle,pbData,dwFileSize,&bytesRead,nullptr);
 								if(bSuccess==FALSE)
 								{
 									app.FatalLoadError();
@@ -287,7 +294,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 		}
 	}
 
-	static __int64 sseed = seed;	// Create static version so this will be valid until next call to this function & whilst thread is running
+	static int64_t sseed = seed;	// Create static version so this will be valid until next call to this function & whilst thread is running
 	ServerStoppedCreate(false);
 	if( g_NetworkManager.IsHost() )
 	{
@@ -312,7 +319,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 	}
 	else
 	{
-		Socket::Initialise(NULL);
+		Socket::Initialise(nullptr);
 	}
 
 #ifndef _XBOX
@@ -354,47 +361,59 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 	// PRIMARY PLAYER
 
 	vector<ClientConnection *> createdConnections;
-	ClientConnection *connection;
+	ClientConnection *connection = nullptr;
 
-	if( g_NetworkManager.IsHost() )
+	if( g_NetworkManager.IsHost() && dedicatedNoLocalHostPlayer )
+	{
+		app.DebugPrintf("Dedicated server mode: skipping local host client connection\n");
+
+		// Keep telemetry behavior consistent with the host path.
+		INT multiplayerInstanceId = TelemetryManager->GenerateMultiplayerInstanceId();
+		TelemetryManager->SetMultiplayerInstanceId(multiplayerInstanceId);
+
+		app.SetGameMode( eMode_Multiplayer );
+	}
+	else if( g_NetworkManager.IsHost() )
 	{
-		connection = new ClientConnection(minecraft, NULL);
+		connection = new ClientConnection(minecraft, nullptr);
 	}
 	else
 	{
 		INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(ProfileManager.GetLockedProfile());
-		if(pNetworkPlayer == NULL)
+		if(pNetworkPlayer == nullptr)
 		{
 			MinecraftServer::HaltServer();
 			app.DebugPrintf("%d\n",ProfileManager.GetLockedProfile());
-			// If the player is NULL here then something went wrong in the session setup, and continuing will end up in a crash
+			// If the player is nullptr here then something went wrong in the session setup, and continuing will end up in a crash
 			return false;
 		}
 
 		Socket *socket = pNetworkPlayer->GetSocket();
 
 		// Fix for #13259 - CRASH: Gameplay: loading process is halted when player loads saved data
-		if(socket == NULL)
+		if(socket == nullptr)
 		{
 			assert(false);
 			MinecraftServer::HaltServer();
-			// If the socket is NULL here then something went wrong in the session setup, and continuing will end up in a crash
+			// If the socket is nullptr here then something went wrong in the session setup, and continuing will end up in a crash
 			return false;
 		}
 
 		connection = new ClientConnection(minecraft, socket);
 	}
 
-	if( !connection->createdOk )
+	if (connection != nullptr)
 	{
-		assert(false);
-		delete connection;
-		connection = NULL;
-		MinecraftServer::HaltServer();
-		return false;
-	}
+		if( !connection->createdOk )
+		{
+			assert(false);
+			delete connection;
+			connection = nullptr;
+			MinecraftServer::HaltServer();
+			return false;
+		}
 
-	connection->send( shared_ptr<PreLoginPacket>( new PreLoginPacket(minecraft->user->name) ) );
+		connection->send(std::make_shared<PreLoginPacket>(minecraft->user->name));
 
 	// Tick connection until we're ready to go. The stages involved in this are:
 	// (1) Creating the ClientConnection sends a prelogin packet to the server
@@ -429,9 +448,9 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 		connection->close();
 	}
 
-	if( connection->isStarted() && !connection->isClosed() )
-	{
-		createdConnections.push_back( connection );
+		if( connection->isStarted() && !connection->isClosed() )
+		{
+			createdConnections.push_back( connection );
 
 		int primaryPad = ProfileManager.GetPrimaryPad();
 		app.SetRichPresenceContext(primaryPad,CONTEXT_GAME_STATE_BLANK);
@@ -453,7 +472,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 			// Already have setup the primary pad
 			if(idx == ProfileManager.GetPrimaryPad() ) continue;
 
-			if( GetLocalPlayerByUserIndex(idx) != NULL && !ProfileManager.IsSignedIn(idx) )
+			if( GetLocalPlayerByUserIndex(idx) != nullptr && !ProfileManager.IsSignedIn(idx) )
 			{
 				INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(idx);
 				Socket *socket = pNetworkPlayer->GetSocket();
@@ -467,7 +486,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 			// when joining any other way, so just because they are signed in doesn't mean they are in the session
 			// 4J Stu - If they are in the session, then we should add them to the game. Otherwise we won't be able to add them later
 			INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(idx);
-			if( pNetworkPlayer == NULL )
+			if( pNetworkPlayer == nullptr )
 				continue;
 
 			ClientConnection *connection;
@@ -481,7 +500,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 			// Open the socket on the server end to accept incoming data
 			Socket::addIncomingSocket(socket);
 
-			connection->send( shared_ptr<PreLoginPacket>( new PreLoginPacket(convStringToWstring( ProfileManager.GetGamertag(idx) )) ) );
+			connection->send(std::make_shared<PreLoginPacket>(convStringToWstring(ProfileManager.GetGamertag(idx))));
 
 			createdConnections.push_back( connection );
 
@@ -528,13 +547,14 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 			}
 		}
 
-		app.SetGameMode( eMode_Multiplayer );
-	}
-	else if ( connection->isClosed() || !IsInSession())
-	{
+			app.SetGameMode( eMode_Multiplayer );
+		}
+		else if ( connection->isClosed() || !IsInSession())
+		{
 //		assert(false);
-		MinecraftServer::HaltServer();
-		return false;
+			MinecraftServer::HaltServer();
+			return false;
+		}
 	}
 
 
@@ -744,7 +764,7 @@ CGameNetworkManager::eJoinGameResult CGameNetworkManager::JoinGame(FriendSession
 	// Make sure that the Primary Pad is in by default
 	localUsersMask |= GetLocalPlayerMask( ProfileManager.GetPrimaryPad() );
 
-	return (eJoinGameResult)(s_pPlatformNetworkManager->JoinGame( searchResult, localUsersMask, primaryUserIndex ));
+	return static_cast<eJoinGameResult>(s_pPlatformNetworkManager->JoinGame(searchResult, localUsersMask, primaryUserIndex));
 }
 
 void CGameNetworkManager::CancelJoinGame(LPVOID lpParam)
@@ -762,7 +782,7 @@ bool CGameNetworkManager::LeaveGame(bool bMigrateHost)
 
 int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	INVITE_INFO * pInviteInfo = (INVITE_INFO *)pParam;
+	INVITE_INFO * pInviteInfo = static_cast<INVITE_INFO *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -801,9 +821,9 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContin
 			// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 			bool noUGC = false;
 #if defined(__PS3__) || defined(__PSVITA__)
-			ProfileManager.GetChatAndContentRestrictions(iPad,false,&noUGC,NULL,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,false,&noUGC,nullptr,nullptr);
 #elif defined(__ORBIS__)
-			ProfileManager.GetChatAndContentRestrictions(iPad,false,NULL,&noUGC,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,false,nullptr,&noUGC,nullptr);
 #endif
 
 			if(noUGC)
@@ -823,7 +843,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContin
 			{
 #if defined(__ORBIS__) || defined(__PSVITA__)
 				bool chatRestricted = false;
-				ProfileManager.GetChatAndContentRestrictions(iPad,false,&chatRestricted,NULL,NULL);
+				ProfileManager.GetChatAndContentRestrictions(iPad,false,&chatRestricted,nullptr,nullptr);
 				if(chatRestricted)
 				{
 					ProfileManager.DisplaySystemMessage( 0, ProfileManager.GetPrimaryPad() );
@@ -912,7 +932,7 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
 			app.SetDisconnectReason( DisconnectPacket::eDisconnect_ConnectionCreationFailed );
 		}
 		// If we failed before the server started, clear the game rules. Otherwise the server will clear it up.
-		if(MinecraftServer::getInstance() == NULL) app.m_gameRules.unloadCurrentGameRules();
+		if(MinecraftServer::getInstance() == nullptr) app.m_gameRules.unloadCurrentGameRules();
 		Tile::ReleaseThreadStorage();
 		return -1;
 	}
@@ -929,21 +949,26 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
 
 int CGameNetworkManager::ServerThreadProc( void* lpParameter )
 {
-	__int64 seed = 0;
-	if(lpParameter != NULL)
+    int64_t seed = 0;
+    if (lpParameter != nullptr)
 	{
-		NetworkGameInitData *param = (NetworkGameInitData *)lpParameter;
+		NetworkGameInitData *param = static_cast<NetworkGameInitData *>(lpParameter);
 		seed = param->seed;
 		app.SetGameHostOption(eGameHostOption_All,param->settings);
 
 		// 4J Stu - If we are loading a DLC save that's separate from the texture pack, load
-		if( param->levelGen != NULL && (param->texturePackId == 0 || param->levelGen->getRequiredTexturePackId() != param->texturePackId) )
+		if (param != nullptr && param->levelGen != nullptr && param->levelGen->isFromDLC())
 		{
 			while((Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkin()))
 			{
 				Sleep(1);
 			}
 			param->levelGen->loadBaseSaveData();
+
+			while (!param->levelGen->hasLoadedData())
+			{
+				Sleep(1);
+			}
 		}
 	}
 
@@ -966,7 +991,7 @@ int CGameNetworkManager::ServerThreadProc( void* lpParameter )
 	IntCache::ReleaseThreadStorage();
 	Level::destroyLightingCache();
 
-	if(lpParameter != NULL) delete lpParameter;
+	if(lpParameter != nullptr) delete lpParameter;
 
 	return S_OK;
 }
@@ -979,7 +1004,7 @@ int	CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
 	Compression::UseDefaultThreadStorage();
 
 	//app.SetGameStarted(false);
-	UIScene_PauseMenu::_ExitWorld(NULL);
+	UIScene_PauseMenu::_ExitWorld(nullptr);
 
 	while( g_NetworkManager.IsInSession() )
 	{
@@ -988,7 +1013,7 @@ int	CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
 
 	// Xbox should always be online when receiving invites - on PS3 we need to check & ask the user to sign in
 #if !defined(__PS3__) && !defined(__PSVITA__)
-	JoinFromInviteData *inviteData = (JoinFromInviteData *)lpParam;
+	JoinFromInviteData *inviteData = static_cast<JoinFromInviteData *>(lpParam);
 	app.SetAction(inviteData->dwUserIndex, eAppAction_JoinFromInvite, lpParam);
 #else
 	if(ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()))
@@ -1216,14 +1241,14 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 #endif
 
 	// Null the network player of all the server players that are local, to stop them being removed from the server when removed from the session
-	if( pServer != NULL )
+	if( pServer != nullptr )
 	{
 		PlayerList *players = pServer->getPlayers();
 		for(auto& servPlayer : players->players)
 		{
 			if( servPlayer->connection->isLocal() && !servPlayer->connection->isGuest() )
 			{
-				servPlayer->connection->connection->getSocket()->setPlayer(NULL);
+				servPlayer->connection->connection->getSocket()->setPlayer(nullptr);
 			}
 		}
 	}
@@ -1259,7 +1284,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 	char numLocalPlayers = 0;
 	for(unsigned int index = 0; index < XUSER_MAX_COUNT; ++index)
 	{
-		if(ProfileManager.IsSignedIn(index) && pMinecraft->localplayers[index] != NULL )
+		if(ProfileManager.IsSignedIn(index) && pMinecraft->localplayers[index] != nullptr )
 		{
 			numLocalPlayers++;
 			localUsersMask |= GetLocalPlayerMask(index);
@@ -1277,11 +1302,11 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 	}
 
 	// Restore the network player of all the server players that are local
-	if( pServer != NULL )
+	if( pServer != nullptr )
 	{
 		for(unsigned int index = 0; index < XUSER_MAX_COUNT; ++index)
 		{
-			if(ProfileManager.IsSignedIn(index) && pMinecraft->localplayers[index] != NULL )
+			if(ProfileManager.IsSignedIn(index) && pMinecraft->localplayers[index] != nullptr )
 			{
 				PlayerUID localPlayerXuid = pMinecraft->localplayers[index]->getXuid();
 
@@ -1295,7 +1320,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 				}
 
 				// Player might have a pending connection
-				if (pMinecraft->m_pendingLocalConnections[index] != NULL)
+				if (pMinecraft->m_pendingLocalConnections[index] != nullptr)
 				{
 					// Update the network player
 					pMinecraft->m_pendingLocalConnections[index]->getConnection()->getSocket()->setPlayer(g_NetworkManager.GetLocalPlayerByUserIndex(index));
@@ -1361,8 +1386,8 @@ void CGameNetworkManager::renderQueueMeter()
 #ifdef _XBOX
 	int height = 720;
 
-	CGameNetworkManager::byteQueue[(CGameNetworkManager::messageQueuePos) & (CGameNetworkManager::messageQueue_length - 1)] = GetHostPlayer()->GetSendQueueSizeBytes(NULL, false);
-	CGameNetworkManager::messageQueue[(CGameNetworkManager::messageQueuePos++) & (CGameNetworkManager::messageQueue_length - 1)] = GetHostPlayer()->GetSendQueueSizeMessages(NULL, false);
+	CGameNetworkManager::byteQueue[(CGameNetworkManager::messageQueuePos) & (CGameNetworkManager::messageQueue_length - 1)] = GetHostPlayer()->GetSendQueueSizeBytes(nullptr, false);
+	CGameNetworkManager::messageQueue[(CGameNetworkManager::messageQueuePos++) & (CGameNetworkManager::messageQueue_length - 1)] = GetHostPlayer()->GetSendQueueSizeMessages(nullptr, false);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	pMinecraft->gui->renderGraph(CGameNetworkManager::messageQueue_length, CGameNetworkManager::messageQueuePos, CGameNetworkManager::messageQueue, 10, 1000, CGameNetworkManager::byteQueue, 100, 25000);
@@ -1426,7 +1451,7 @@ void CGameNetworkManager::StateChange_AnyToStarting()
 	{
 		LoadingInputParams *loadingParams = new LoadingInputParams();
 		loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-		loadingParams->lpParam = NULL;
+		loadingParams->lpParam = nullptr;
 
 		UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 		completionData->bShowBackground=TRUE;
@@ -1447,7 +1472,7 @@ void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying)
 		for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 		{
 			INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(i);
-			if(pNetworkPlayer != NULL && ProfileManager.IsSignedIn( i ) )
+			if(pNetworkPlayer != nullptr && ProfileManager.IsSignedIn( i ) )
 			{
 				app.DebugPrintf("Stats save for an offline game for the player at index %d\n", i );
 				Minecraft::GetInstance()->forceStatsSave(pNetworkPlayer->GetUserIndex());
@@ -1482,12 +1507,12 @@ void CGameNetworkManager::CreateSocket( INetworkPlayer *pNetworkPlayer, bool loc
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	Socket *socket = NULL;
+	Socket *socket = nullptr;
 	shared_ptr<MultiplayerLocalPlayer> mpPlayer = nullptr;
 	int userIdx = pNetworkPlayer->GetUserIndex();
 	if (userIdx >= 0 && userIdx < XUSER_MAX_COUNT)
 		mpPlayer = pMinecraft->localplayers[userIdx];
-	if( localPlayer && mpPlayer != NULL && mpPlayer->connection != NULL)
+	if( localPlayer && mpPlayer != nullptr && mpPlayer->connection != nullptr)
 	{
 		// If we already have a MultiplayerLocalPlayer here then we are doing a session type change
 		socket = mpPlayer->connection->getSocket();
@@ -1501,6 +1526,45 @@ void CGameNetworkManager::CreateSocket( INetworkPlayer *pNetworkPlayer, bool loc
 	}
 	else
 	{
+#ifdef _WINDOWS64
+		// Non-host split-screen: open a dedicated TCP connection for this pad
+		if (localPlayer && !g_NetworkManager.IsHost() && g_NetworkManager.IsInGameplay())
+		{
+			int padIdx = pNetworkPlayer->GetUserIndex();
+			BYTE assignedSmallId = 0;
+
+			if (!WinsockNetLayer::JoinSplitScreen(padIdx, &assignedSmallId))
+			{
+				app.DebugPrintf("Split-screen pad %d: failed to open TCP to host\n", padIdx);
+				pMinecraft->connectionDisconnected(padIdx, DisconnectPacket::eDisconnect_ConnectionCreationFailed);
+				return;
+			}
+
+			// Update the local IQNetPlayer (at pad index) with the host-assigned smallId.
+			// The NetworkPlayerXbox created by NotifyPlayerJoined already points to
+			// m_player[padIdx], so we just set the smallId for network routing.
+			IQNet::m_player[padIdx].m_smallId = assignedSmallId;
+			IQNet::m_player[padIdx].m_resolvedXuid = Win64Xuid::DeriveXuidForPad(Win64Xuid::ResolvePersistentXuid(), padIdx);
+
+			// Network socket (not hostLocal) — data goes through TCP via GetLocalSocket
+			socket = new Socket(pNetworkPlayer, false, false);
+			pNetworkPlayer->SetSocket(socket);
+
+			ClientConnection* connection = new ClientConnection(pMinecraft, socket, padIdx);
+			if (connection->createdOk)
+			{
+				connection->send(shared_ptr<PreLoginPacket>(new PreLoginPacket(pNetworkPlayer->GetOnlineName())));
+				pMinecraft->addPendingLocalConnection(padIdx, connection);
+			}
+			else
+			{
+				pMinecraft->connectionDisconnected(padIdx, DisconnectPacket::eDisconnect_ConnectionCreationFailed);
+				delete connection;
+			}
+			return;
+		}
+#endif
+
 		socket = new Socket( pNetworkPlayer, g_NetworkManager.IsHost(), g_NetworkManager.IsHost() && localPlayer );
 		pNetworkPlayer->SetSocket( socket );
 
@@ -1523,14 +1587,14 @@ void CGameNetworkManager::CreateSocket( INetworkPlayer *pNetworkPlayer, bool loc
 
 			if( connection->createdOk )
 			{
-				connection->send( shared_ptr<PreLoginPacket>( new PreLoginPacket( pNetworkPlayer->GetOnlineName() ) ) );
+				connection->send(std::make_shared<PreLoginPacket>(pNetworkPlayer->GetOnlineName()));
 				pMinecraft->addPendingLocalConnection(idx, connection);
 			}
 			else
 			{
 				pMinecraft->connectionDisconnected( idx , DisconnectPacket::eDisconnect_ConnectionCreationFailed );
 				delete connection;
-				connection = NULL;
+				connection = nullptr;
 			}
 		}
 	}
@@ -1540,10 +1604,10 @@ void CGameNetworkManager::CreateSocket( INetworkPlayer *pNetworkPlayer, bool loc
 void CGameNetworkManager::CloseConnection( INetworkPlayer *pNetworkPlayer )
 {
 	MinecraftServer *server = MinecraftServer::getInstance();
-	if( server != NULL )
+	if( server != nullptr )
 	{
 		PlayerList *players = server->getPlayers();
-		if( players != NULL )
+		if( players != nullptr )
 		{
 			players->closePlayerConnectionBySmallId(pNetworkPlayer->GetSmallId());
 		}
@@ -1559,7 +1623,7 @@ void CGameNetworkManager::PlayerJoining( INetworkPlayer *pNetworkPlayer )
 		for (int iPad=0; iPad<XUSER_MAX_COUNT; ++iPad)
 		{
 			INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(iPad);
-			if (pNetworkPlayer == NULL)	continue;
+			if (pNetworkPlayer == nullptr)	continue;
 
 			app.SetRichPresenceContext(iPad,CONTEXT_GAME_STATE_BLANK);
 			if (multiplayer)
@@ -1586,7 +1650,7 @@ void CGameNetworkManager::PlayerJoining( INetworkPlayer *pNetworkPlayer )
         {
 			for(int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 			{
-				if(Minecraft::GetInstance()->localplayers[idx] != NULL)
+				if(Minecraft::GetInstance()->localplayers[idx] != nullptr)
 				{
 					TelemetryManager->RecordLevelStart(idx, eSen_FriendOrMatch_Playing_With_Invited_Friends, eSen_CompeteOrCoop_Coop_and_Competitive, Minecraft::GetInstance()->level->difficulty, app.GetLocalPlayerCount(), g_NetworkManager.GetOnlinePlayerCount());
 				}
@@ -1609,7 +1673,7 @@ void CGameNetworkManager::PlayerLeaving( INetworkPlayer *pNetworkPlayer )
 	{
 		for(int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
-			if(Minecraft::GetInstance()->localplayers[idx] != NULL)
+			if(Minecraft::GetInstance()->localplayers[idx] != nullptr)
 			{
 				TelemetryManager->RecordLevelStart(idx, eSen_FriendOrMatch_Playing_With_Invited_Friends, eSen_CompeteOrCoop_Coop_and_Competitive, Minecraft::GetInstance()->level->difficulty, app.GetLocalPlayerCount(), g_NetworkManager.GetOnlinePlayerCount());
 			}
@@ -1632,7 +1696,7 @@ void CGameNetworkManager::WriteStats( INetworkPlayer *pNetworkPlayer )
 void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *pInviteInfo)
 {
 #ifdef __ORBIS__
-	if (m_pUpsell != NULL)
+	if (m_pUpsell != nullptr)
 	{
 		delete pInviteInfo;
 		return;
@@ -1721,7 +1785,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
 		{
 			// 4J-PB we shouldn't bring any inactive players into the game, except for the invited player (who may be an inactive player)
 			// 4J Stu - If we are not in a game, then bring in all players signed in
-			if(index==userIndex || pMinecraft->localplayers[index]!=NULL )
+			if(index==userIndex || pMinecraft->localplayers[index]!=nullptr )
 			{
 				++joiningUsers;
 				if( !ProfileManager.AllowedToPlayMultiplayer(index) ) noPrivileges = true;
@@ -1736,7 +1800,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
 	BOOL pccAllowed = TRUE;
 	BOOL pccFriendsAllowed = TRUE;
 #if defined(__PS3__) || defined(__PSVITA__)
-	ProfileManager.GetChatAndContentRestrictions(userIndex,false,&noUGC,&bContentRestricted,NULL);
+	ProfileManager.GetChatAndContentRestrictions(userIndex,false,&noUGC,&bContentRestricted,nullptr);
 #else
 	ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 	if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
@@ -1781,14 +1845,14 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
 		uiIDA[0]=IDS_CONFIRM_OK;
 
 		// 4J-PB - it's possible there is no primary pad here, when accepting an invite from the dashboard
-		//StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+		//StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 		ui.RequestErrorMessage( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA,1,XUSER_INDEX_ANY);
 	}
 	else
 	{
 #if defined(__ORBIS__) || defined(__PSVITA__)
 		bool chatRestricted = false;
-		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 		if(chatRestricted)
 		{
 			ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1984,7 +2048,7 @@ const char *CGameNetworkManager::GetOnlineName(int playerIdx)
 
 void CGameNetworkManager::ServerReadyCreate(bool create)
 {
-	m_hServerReadyEvent = ( create ? ( new C4JThread::Event ) : NULL );
+	m_hServerReadyEvent = ( create ? ( new C4JThread::Event ) : nullptr );
 }
 
 void CGameNetworkManager::ServerReady()
@@ -2000,17 +2064,17 @@ void CGameNetworkManager::ServerReadyWait()
 void CGameNetworkManager::ServerReadyDestroy()
 {
 	delete m_hServerReadyEvent;
-	m_hServerReadyEvent = NULL;
+	m_hServerReadyEvent = nullptr;
 }
 
 bool CGameNetworkManager::ServerReadyValid()
 {
-	return ( m_hServerReadyEvent != NULL );
+	return ( m_hServerReadyEvent != nullptr );
 }
 
 void CGameNetworkManager::ServerStoppedCreate(bool create)
 {
-	m_hServerStoppedEvent = ( create ? ( new C4JThread::Event ) : NULL );
+	m_hServerStoppedEvent = ( create ? ( new C4JThread::Event ) : nullptr );
 }
 
 void CGameNetworkManager::ServerStopped()
@@ -2051,12 +2115,12 @@ void CGameNetworkManager::ServerStoppedWait()
 void CGameNetworkManager::ServerStoppedDestroy()
 {
 	delete m_hServerStoppedEvent;
-	m_hServerStoppedEvent = NULL;
+	m_hServerStoppedEvent = nullptr;
 }
 
 bool CGameNetworkManager::ServerStoppedValid()
 {
-	return ( m_hServerStoppedEvent != NULL );
+	return ( m_hServerStoppedEvent != nullptr );
 }
 
 int CGameNetworkManager::GetJoiningReadyPercentage()
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h
index bb7633c2..3357b3cd 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.h
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.h
@@ -100,26 +100,26 @@ public:
 	void			SetSessionsUpdatedCallback( void (*SessionsUpdatedCallback)(LPVOID pParam), LPVOID pSearchParam );
 	void			GetFullFriendSessionInfo( FriendSessionInfo *foundSession, void (* FriendSessionUpdatedFn)(bool success, void *pParam), void *pParam );
 	void			ForceFriendsSessionRefresh();
-	
+
 	// Session joining and leaving
 
 	bool			JoinGameFromInviteInfo( int userIndex, int userMask, const INVITE_INFO *pInviteInfo);
-	eJoinGameResult	JoinGame(FriendSessionInfo *searchResult, int localUsersMask);	
+	eJoinGameResult	JoinGame(FriendSessionInfo *searchResult, int localUsersMask);
 	static void		CancelJoinGame(LPVOID lpParam); // Not part of the shared interface
 	bool			LeaveGame(bool bMigrateHost);
 	static int		JoinFromInvite_SignInReturned(void *pParam,bool bContinue, int iPad);
-	void			UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = NULL);
+	void			UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = nullptr);
 	void			SendInviteGUI(int iPad);
 	void			ResetLeavingGame();
 
 	// Threads
-	
+
 	bool			IsNetworkThreadRunning();
 	static int		RunNetworkGameThreadProc( void* lpParameter );
 	static int		ServerThreadProc( void* lpParameter );
 	static int		ExitAndJoinFromInviteThreadProc( void* lpParam );
 
-#if (defined __PS3__) || (defined __ORBIS__) || (defined __PSVITA__) 
+#if (defined __PS3__) || (defined __ORBIS__) || (defined __PSVITA__)
 	static int		MustSignInReturned_0(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static int		PSNSignInReturned_0(void* pParam, bool bContinue, int iPad);
 
@@ -130,24 +130,24 @@ public:
 	static void		_LeaveGame();
 	static int		ChangeSessionTypeThreadProc( void* lpParam );
 
-	// System flags	
+	// System flags
 
 	void SystemFlagSet(INetworkPlayer *pNetworkPlayer, int index);
 	bool SystemFlagGet(INetworkPlayer *pNetworkPlayer, int index);
 
 	// Events
 
-	void ServerReadyCreate(bool create);	// Create the signal (or set to NULL)
+	void ServerReadyCreate(bool create);	// Create the signal (or set to nullptr)
 	void ServerReady();						// Signal that we are ready
 	void ServerReadyWait();					// Wait for the signal
 	void ServerReadyDestroy();				// Destroy signal
-	bool ServerReadyValid();				// Is non-NULL
+	bool ServerReadyValid();				// Is non-nullptr
 
 	void ServerStoppedCreate(bool create);	// Create the signal
 	void ServerStopped();					// Signal that we are ready
-	void ServerStoppedWait();				// Wait for the signal	
-	void ServerStoppedDestroy();			// Destroy signal	
-	bool ServerStoppedValid();				// Is non-NULL
+    void ServerStoppedWait();               // Wait for the signal
+    void ServerStoppedDestroy();            // Destroy signal
+    bool ServerStoppedValid();              // Is non-nullptr
 
 #ifdef __PSVITA__
 	static bool usingAdhocMode();
@@ -164,9 +164,9 @@ public:
 
 	// Used for debugging output
 	static const int messageQueue_length = 512;
-	static __int64 messageQueue[messageQueue_length];
+	static int64_t messageQueue[messageQueue_length];
 	static const int byteQueue_length = 512;
-    static __int64 byteQueue[byteQueue_length];
+    static int64_t byteQueue[byteQueue_length];
 	static int messageQueuePos;
 
 	// Methods called from PlatformNetworkManager
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
index 31c415a7..3ed0f888 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
@@ -93,7 +93,7 @@ private:
 
 
 public:
-	virtual void UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = NULL) = 0;
+	virtual void UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = nullptr) = 0;
 
 private:
 	virtual bool RemoveLocalPlayer( INetworkPlayer *pNetworkPlayer ) = 0;
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
index 85531e47..1e625098 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
@@ -5,8 +5,11 @@
 #include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 #ifdef _WINDOWS64
 #include "..\..\Windows64\Network\WinsockNetLayer.h"
+#include "..\..\Windows64\Windows64_Xuid.h"
 #include "..\..\Minecraft.h"
 #include "..\..\User.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\PlayerList.h"
 #include <iostream>
 #endif
 
@@ -23,7 +26,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer	)
 	bool createFakeSocket = false;
 	bool localPlayer = false;
 
-	NetworkPlayerXbox *networkPlayer = (NetworkPlayerXbox *)addNetworkPlayer(pQNetPlayer);
+	NetworkPlayerXbox *networkPlayer = static_cast<NetworkPlayerXbox *>(addNetworkPlayer(pQNetPlayer));
 
     if( pQNetPlayer->IsLocal() )
     {
@@ -87,8 +90,8 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer	)
         pQNetPlayer,
         pQNetPlayer->GetGamertag(),
         pszDescription,
-        (int) pQNetPlayer->HasVoice(),
-        (int) pQNetPlayer->HasCamera() );
+        pQNetPlayer->HasVoice(),
+        pQNetPlayer->HasCamera() );
 
 
 	if( m_pIQNet->IsHost() )
@@ -100,7 +103,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer	)
 
 	for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 	{
-		if(playerChangedCallback[idx] != NULL)
+		if(playerChangedCallback[idx] != nullptr)
 			playerChangedCallback[idx]( playerChangedCallbackParam[idx], networkPlayer, false );
 	}
 
@@ -109,7 +112,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer	)
 		int localPlayerCount = 0;
 		for(unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
-			if( m_pIQNet->GetLocalPlayerByUserIndex(idx) != NULL ) ++localPlayerCount;
+			if( m_pIQNet->GetLocalPlayerByUserIndex(idx) != nullptr ) ++localPlayerCount;
 		}
 
 		float appTime = app.getAppTime();
@@ -124,11 +127,11 @@ void CPlatformNetworkManagerStub::NotifyPlayerLeaving(IQNetPlayer* pQNetPlayer)
 	app.DebugPrintf("Player 0x%p \"%ls\" leaving.\n", pQNetPlayer, pQNetPlayer->GetGamertag());
 
 	INetworkPlayer* networkPlayer = getNetworkPlayer(pQNetPlayer);
-	if (networkPlayer == NULL)
+	if (networkPlayer == nullptr)
 		return;
 
 	Socket* socket = networkPlayer->GetSocket();
-	if (socket != NULL)
+	if (socket != nullptr)
 	{
 		if (m_pIQNet->IsHost())
 			g_NetworkManager.CloseConnection(networkPlayer);
@@ -143,7 +146,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerLeaving(IQNetPlayer* pQNetPlayer)
 
 	for (int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 	{
-		if (playerChangedCallback[idx] != NULL)
+		if (playerChangedCallback[idx] != nullptr)
 			playerChangedCallback[idx](playerChangedCallbackParam[idx], networkPlayer, true);
 	}
 
@@ -159,7 +162,7 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
 	g_pPlatformNetworkManager = this;
 	for( int i = 0; i < XUSER_MAX_COUNT; i++ )
 	{
-		playerChangedCallback[ i ] = NULL;
+		playerChangedCallback[ i ] = nullptr;
 	}
 
 	m_bLeavingGame = false;
@@ -170,8 +173,8 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
 	m_bSearchPending = false;
 
 	m_bIsOfflineGame = false;
-	m_pSearchParam = NULL;
-	m_SessionsUpdatedCallback = NULL;
+	m_pSearchParam = nullptr;
+	m_SessionsUpdatedCallback = nullptr;
 
 	for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 	{
@@ -179,10 +182,10 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
 		m_lastSearchStartTime[i] = 0;
 
 		// The results that will be filled in with the current search
-		m_pSearchResults[i] = NULL;
-		m_pQoSResult[i] = NULL;
-		m_pCurrentSearchResults[i] = NULL;
-		m_pCurrentQoSResult[i] = NULL;
+		m_pSearchResults[i] = nullptr;
+		m_pQoSResult[i] = nullptr;
+		m_pCurrentSearchResults[i] = nullptr;
+		m_pCurrentQoSResult[i] = nullptr;
 		m_currentSearchResultsCount[i] = 0;
 	}
 
@@ -228,23 +231,73 @@ void CPlatformNetworkManagerStub::DoWork()
 		while (WinsockNetLayer::PopDisconnectedSmallId(&disconnectedSmallId))
 		{
 			IQNetPlayer* qnetPlayer = m_pIQNet->GetPlayerBySmallId(disconnectedSmallId);
-			if (qnetPlayer != NULL && qnetPlayer->m_smallId == disconnectedSmallId)
+			if (qnetPlayer != nullptr && qnetPlayer->m_smallId == disconnectedSmallId)
 			{
 				NotifyPlayerLeaving(qnetPlayer);
 				qnetPlayer->m_smallId = 0;
 				qnetPlayer->m_isRemote = false;
 				qnetPlayer->m_isHostPlayer = false;
+				qnetPlayer->m_resolvedXuid = INVALID_XUID;
 				qnetPlayer->m_gamertag[0] = 0;
 				qnetPlayer->SetCustomDataValue(0);
-				WinsockNetLayer::PushFreeSmallId(disconnectedSmallId);
-				if (IQNet::s_playerCount > 1)
+				// Recalculate s_playerCount as the highest active slot + 1.
+				// A blind decrement would hide players at higher-indexed slots when a
+				// lower-indexed player disconnects first: GetPlayerBySmallId scans
+				// [0, s_playerCount) so any slot at or above the decremented count
+				// becomes invisible, causing its disconnect to be missed (ghost player).
+				while (IQNet::s_playerCount > 1 &&
+					   IQNet::m_player[IQNet::s_playerCount - 1].GetCustomDataValue() == 0)
 					IQNet::s_playerCount--;
 			}
+			// NOTE: Do NOT call PushFreeSmallId here. The old PlayerConnection's
+			// write thread may still be alive (it dies in PlayerList::tick when
+			// m_smallIdsToClose is processed). If we recycle the smallId now,
+			// AcceptThread can reuse it for a new connection, and the old write
+			// thread's getPlayer() lookup will resolve to the NEW player, sending
+			// stale game packets to the new client's TCP socket — corrupting its
+			// login handshake (bad packet id crash). PushFreeSmallId and
+			// ClearSocketForSmallId are called from PlayerList::tick after the
+			// old Connection threads are dead.
+			//
+			// Clear chunk visibility flags for this system so rejoin gets fresh chunk state.
+			SystemFlagRemoveBySmallId(disconnectedSmallId);
+		}
+	}
+
+	// Client-side host disconnect detection:
+	// if TCP is gone, propagate through normal network-disconnect flow so UI returns to menus.
+	// The processing from the Xbox version will be reused.
+	if (_iQNetStubState == QNET_STATE_GAME_PLAY && !m_pIQNet->IsHost() && !m_bLeavingGame)
+	{
+		if (!WinsockNetLayer::IsConnected())
+		{
+			if (!m_bLeaveGameOnTick)
+			{
+				m_bLeaveGameOnTick = true;
+				g_NetworkManager.HandleDisconnect(false);
+			}
+		}
+		else
+		{
+			m_bLeaveGameOnTick = false;
 		}
 	}
 #endif
 }
 
+bool CPlatformNetworkManagerStub::CanAcceptMoreConnections()
+{
+#ifdef _WINDOWS64
+	MinecraftServer* server = MinecraftServer::getInstance();
+	if (server == NULL) return true;
+	PlayerList* list = server->getPlayerList();
+	if (list == NULL) return true;
+	return static_cast<unsigned int>(list->players.size()) < static_cast<unsigned int>(list->getMaxPlayers());
+#else
+	return true;
+#endif
+}
+
 int CPlatformNetworkManagerStub::GetPlayerCount()
 {
 	return m_pIQNet->GetPlayerCount();
@@ -267,12 +320,40 @@ int CPlatformNetworkManagerStub::GetLocalPlayerMask(int playerIndex)
 
 bool CPlatformNetworkManagerStub::AddLocalPlayerByUserIndex( int userIndex )
 {
-	NotifyPlayerJoined(m_pIQNet->GetLocalPlayerByUserIndex(userIndex));
-	return ( m_pIQNet->AddLocalPlayerByUserIndex(userIndex) == S_OK );
+	if ( m_pIQNet->AddLocalPlayerByUserIndex(userIndex) != S_OK )
+		return false;
+	// Player is now registered in IQNet — get a pointer and notify the network layer.
+	// Use the static array directly: GetLocalPlayerByUserIndex checks customData which
+	// isn't set until addNetworkPlayer runs inside NotifyPlayerJoined.
+	NotifyPlayerJoined(&IQNet::m_player[userIndex]);
+	return true;
 }
 
 bool CPlatformNetworkManagerStub::RemoveLocalPlayerByUserIndex( int userIndex )
 {
+#ifdef _WINDOWS64
+	if (userIndex > 0 && userIndex < XUSER_MAX_COUNT && !m_pIQNet->IsHost())
+	{
+		IQNetPlayer* qp = &IQNet::m_player[userIndex];
+
+		// Notify the network layer before clearing the slot
+		if (qp->GetCustomDataValue() != 0)
+		{
+			NotifyPlayerLeaving(qp);
+		}
+
+		// Close the split-screen TCP connection and reset WinsockNetLayer state
+		WinsockNetLayer::CloseSplitScreenConnection(userIndex);
+
+		// Clear the IQNet slot so it can be reused on rejoin
+		qp->m_smallId = 0;
+		qp->m_isRemote = false;
+		qp->m_isHostPlayer = false;
+		qp->m_resolvedXuid = INVALID_XUID;
+		qp->m_gamertag[0] = 0;
+		qp->SetCustomDataValue(0);
+	}
+#endif
 	return true;
 }
 
@@ -300,6 +381,7 @@ bool CPlatformNetworkManagerStub::LeaveGame(bool bMigrateHost)
 	if( m_bLeavingGame ) return true;
 
 	m_bLeavingGame = true;
+	m_bLeaveGameOnTick = false;
 
 #ifdef _WINDOWS64
 	WinsockNetLayer::StopAdvertising();
@@ -348,13 +430,16 @@ void CPlatformNetworkManagerStub::HostGame(int localUsersMask, bool bOnlineGame,
 	localUsersMask |= GetLocalPlayerMask( g_NetworkManager.GetPrimaryPad() );
 
 	m_bLeavingGame = false;
+	m_bLeaveGameOnTick = false;
 
 	m_pIQNet->HostGame();
 
 #ifdef _WINDOWS64
 	IQNet::m_player[0].m_smallId = 0;
 	IQNet::m_player[0].m_isRemote = false;
+	// world host is pinned to legacy host XUID to keep old player data compatibility.
 	IQNet::m_player[0].m_isHostPlayer = true;
+	IQNet::m_player[0].m_resolvedXuid = Win64Xuid::GetLegacyEmbeddedHostXuid();
 	IQNet::s_playerCount = 1;
 #endif
 
@@ -362,7 +447,7 @@ void CPlatformNetworkManagerStub::HostGame(int localUsersMask, bool bOnlineGame,
 
 #ifdef _WINDOWS64
 	int port = WIN64_NET_DEFAULT_PORT;
-	const char* bindIp = NULL;
+	const char* bindIp = nullptr;
 	if (g_Win64DedicatedServer)
 	{
 		if (g_Win64DedicatedServerPort > 0)
@@ -375,9 +460,23 @@ void CPlatformNetworkManagerStub::HostGame(int localUsersMask, bool bOnlineGame,
 
 	if (WinsockNetLayer::IsActive())
 	{
-		const wchar_t* hostName = IQNet::m_player[0].m_gamertag;
-		unsigned int settings = app.GetGameHostOption(eGameHostOption_All);
-		WinsockNetLayer::StartAdvertising(port, hostName, settings, 0, 0, MINECRAFT_NET_VERSION);
+		// For Dedicated Server, refer to `lan-advertise` in `server.properties`
+		bool enableLanAdvertising = true;
+		if (g_Win64DedicatedServer)
+		{
+			enableLanAdvertising = g_Win64DedicatedServerLanAdvertise;
+		}
+
+		if (enableLanAdvertising)
+		{
+			const wchar_t* hostName = IQNet::m_player[0].m_gamertag;
+			unsigned int settings = app.GetGameHostOption(eGameHostOption_All);
+			WinsockNetLayer::StartAdvertising(port, hostName, settings, 0, 0, MINECRAFT_NET_VERSION);
+		}
+		else
+		{
+			WinsockNetLayer::StopAdvertising();
+		}
 	}
 #endif
 //#endif
@@ -395,7 +494,7 @@ bool CPlatformNetworkManagerStub::_StartGame()
 int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo* searchResult, int localUsersMask, int primaryUserIndex)
 {
 #ifdef _WINDOWS64
-	if (searchResult == NULL)
+	if (searchResult == nullptr)
 		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
 
 	const char* hostIP = searchResult->data.hostIP;
@@ -405,12 +504,15 @@ int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo* searchResult, int l
 		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
 
 	m_bLeavingGame = false;
+	m_bLeaveGameOnTick = false;
 	IQNet::s_isHosting = false;
 	m_pIQNet->ClientJoinGame();
 
 	IQNet::m_player[0].m_smallId = 0;
 	IQNet::m_player[0].m_isRemote = true;
 	IQNet::m_player[0].m_isHostPlayer = true;
+	// Remote host still maps to legacy host XUID in mixed old/new sessions.
+	IQNet::m_player[0].m_resolvedXuid = Win64Xuid::GetLegacyEmbeddedHostXuid();
 	wcsncpy_s(IQNet::m_player[0].m_gamertag, 32, searchResult->data.hostName, _TRUNCATE);
 
 	WinsockNetLayer::StopDiscovery();
@@ -426,6 +528,8 @@ int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo* searchResult, int l
 	IQNet::m_player[localSmallId].m_smallId = localSmallId;
 	IQNet::m_player[localSmallId].m_isRemote = false;
 	IQNet::m_player[localSmallId].m_isHostPlayer = false;
+	// Local non-host identity is the persistent uid.dat XUID.
+	IQNet::m_player[localSmallId].m_resolvedXuid = Win64Xuid::ResolvePersistentXuid();
 
 	Minecraft* pMinecraft = Minecraft::GetInstance();
 	wcscpy_s(IQNet::m_player[localSmallId].m_gamertag, 32, pMinecraft->user->name.c_str());
@@ -465,8 +569,8 @@ void CPlatformNetworkManagerStub::UnRegisterPlayerChangedCallback(int iPad, void
 {
 	if(playerChangedCallbackParam[iPad] == callbackParam)
 	{
-		playerChangedCallback[iPad] = NULL;
-		playerChangedCallbackParam[iPad] = NULL;
+		playerChangedCallback[iPad] = nullptr;
+		playerChangedCallbackParam[iPad] = nullptr;
 	}
 }
 
@@ -486,7 +590,7 @@ bool CPlatformNetworkManagerStub::_RunNetworkGame()
 		if (IQNet::m_player[i].m_isRemote)
 		{
 			INetworkPlayer* pNetworkPlayer = getNetworkPlayer(&IQNet::m_player[i]);
-			if (pNetworkPlayer != NULL && pNetworkPlayer->GetSocket() != NULL)
+			if (pNetworkPlayer != nullptr && pNetworkPlayer->GetSocket() != nullptr)
 			{
 				Socket::addIncomingSocket(pNetworkPlayer->GetSocket());
 			}
@@ -496,14 +600,14 @@ bool CPlatformNetworkManagerStub::_RunNetworkGame()
 	return true;
 }
 
-void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= NULL*/)
+void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= nullptr*/)
 {
 // 	DWORD playerCount = m_pIQNet->GetPlayerCount();
 //
 // 	if( this->m_bLeavingGame )
 // 		return;
 //
-// 	if( GetHostPlayer() == NULL )
+// 	if( GetHostPlayer() == nullptr )
 // 		return;
 //
 // 	for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
@@ -523,13 +627,13 @@ void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pN
 // 			}
 // 			else
 // 			{
-// 				m_hostGameSessionData.players[i] = NULL;
+// 				m_hostGameSessionData.players[i] = nullptr;
 // 				memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
 // 			}
 // 		}
 // 		else
 // 		{
-// 			m_hostGameSessionData.players[i] = NULL;
+// 			m_hostGameSessionData.players[i] = nullptr;
 // 			memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
 // 		}
 // 	}
@@ -540,18 +644,18 @@ void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pN
 
 int CPlatformNetworkManagerStub::RemovePlayerOnSocketClosedThreadProc( void* lpParam )
 {
-	INetworkPlayer *pNetworkPlayer = (INetworkPlayer *)lpParam;
+	INetworkPlayer *pNetworkPlayer = static_cast<INetworkPlayer *>(lpParam);
 
 	Socket *socket = pNetworkPlayer->GetSocket();
 
-	if( socket != NULL )
+	if( socket != nullptr )
 	{
 		//printf("Waiting for socket closed event\n");
 		socket->m_socketClosedEvent->WaitForSignal(INFINITE);
 
 		//printf("Socket closed event has fired\n");
 		// 4J Stu - Clear our reference to this socket
-		pNetworkPlayer->SetSocket( NULL );
+		pNetworkPlayer->SetSocket( nullptr );
 		delete socket;
 	}
 
@@ -573,6 +677,7 @@ CPlatformNetworkManagerStub::PlayerFlags::PlayerFlags(INetworkPlayer *pNetworkPl
 	this->flags = new unsigned char [ count / 8 ];
 	memset( this->flags, 0, count / 8 );
 	this->count = count;
+	this->m_smallId = (pNetworkPlayer && pNetworkPlayer->IsLocal()) ? 256 : (pNetworkPlayer ? static_cast<int>(pNetworkPlayer->GetSmallId()) : -1);
 }
 CPlatformNetworkManagerStub::PlayerFlags::~PlayerFlags()
 {
@@ -610,6 +715,23 @@ void CPlatformNetworkManagerStub::SystemFlagRemovePlayer(INetworkPlayer *pNetwor
 	}
 }
 
+// Clear chunk flags for a system when they disconnect (by smallId). Call even when we don't find the player,
+// so we always clear and the smallId can be reused without stale "chunk seen" state.
+void CPlatformNetworkManagerStub::SystemFlagRemoveBySmallId(int smallId)
+{
+	if (smallId < 0) return;
+	for (unsigned int i = 0; i < m_playerFlags.size(); i++)
+	{
+		if (m_playerFlags[i]->m_smallId == smallId)
+		{
+			delete m_playerFlags[i];
+			m_playerFlags[i] = m_playerFlags.back();
+			m_playerFlags.pop_back();
+			return;
+		}
+	}
+}
+
 void CPlatformNetworkManagerStub::SystemFlagReset()
 {
 	for( unsigned int i = 0; i < m_playerFlags.size(); i++ )
@@ -623,7 +745,7 @@ void CPlatformNetworkManagerStub::SystemFlagReset()
 void CPlatformNetworkManagerStub::SystemFlagSet(INetworkPlayer *pNetworkPlayer, int index)
 {
 	if( ( index < 0 ) || ( index >= m_flagIndexSize ) ) return;
-	if( pNetworkPlayer == NULL ) return;
+	if( pNetworkPlayer == nullptr ) return;
 
 	for( unsigned int i = 0; i < m_playerFlags.size(); i++ )
 	{
@@ -639,7 +761,7 @@ void CPlatformNetworkManagerStub::SystemFlagSet(INetworkPlayer *pNetworkPlayer,
 bool CPlatformNetworkManagerStub::SystemFlagGet(INetworkPlayer *pNetworkPlayer, int index)
 {
 	if( ( index < 0 ) || ( index >= m_flagIndexSize ) ) return false;
-	if( pNetworkPlayer == NULL )
+	if( pNetworkPlayer == nullptr )
 	{
 		return false;
 	}
@@ -667,7 +789,7 @@ wstring CPlatformNetworkManagerStub::GatherRTTStats()
 
 	for(unsigned int i = 0; i < GetPlayerCount(); ++i)
 	{
-		IQNetPlayer *pQNetPlayer = ((NetworkPlayerXbox *)GetPlayerByIndex( i ))->GetQNetPlayer();
+		IQNetPlayer *pQNetPlayer = static_cast<NetworkPlayerXbox *>(GetPlayerByIndex(i))->GetQNetPlayer();
 
 		if(!pQNetPlayer->IsLocal())
 		{
@@ -682,7 +804,7 @@ wstring CPlatformNetworkManagerStub::GatherRTTStats()
 void CPlatformNetworkManagerStub::TickSearch()
 {
 #ifdef _WINDOWS64
-	if (m_SessionsUpdatedCallback == NULL)
+	if (m_SessionsUpdatedCallback == nullptr)
 		return;
 
 	static DWORD lastSearchTime = 0;
@@ -711,7 +833,7 @@ void CPlatformNetworkManagerStub::SearchForGames()
 		size_t nameLen = wcslen(lanSessions[i].hostName);
 		info->displayLabel = new wchar_t[nameLen + 1];
 		wcscpy_s(info->displayLabel, nameLen + 1, lanSessions[i].hostName);
-		info->displayLabelLength = (unsigned char)nameLen;
+		info->displayLabelLength = static_cast<unsigned char>(nameLen);
 		info->displayLabelViewableStartIndex = 0;
 
 		info->data.netVersion = lanSessions[i].netVersion;
@@ -726,63 +848,64 @@ void CPlatformNetworkManagerStub::SearchForGames()
 		info->data.playerCount = lanSessions[i].playerCount;
 		info->data.maxPlayers = lanSessions[i].maxPlayers;
 
-		info->sessionId = (SessionID)((unsigned __int64)inet_addr(lanSessions[i].hostIP) | ((unsigned __int64)lanSessions[i].hostPort << 32));
+        info->sessionId = static_cast<uint64_t>(inet_addr(lanSessions[i].hostIP)) |
+                          static_cast<uint64_t>(lanSessions[i].hostPort) << 32;
 
 		friendsSessions[0].push_back(info);
 	}
 
-	std::FILE* file = std::fopen("servers.txt", "r");
-
-	if (file) {
-		wstring wline;
-		int phase = 0;
-
-		string ip;
-		wstring port;
-		wstring name;
+	if (std::FILE* file = std::fopen("servers.db", "rb")) {
+		char magic[4] = {};
+		if (std::fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+		{
+			uint32_t version = 0, count = 0;
+			std::fread(&version, sizeof(uint32_t), 1, file);
+			std::fread(&count, sizeof(uint32_t), 1, file);
 
-		char buffer[512];
-		while (std::fgets(buffer, sizeof(buffer), file)) {
-			if (phase == 0) {
-				ip = buffer;
-				if (!ip.empty() && (ip.back() == '\n' || ip.back() == '\r'))
-					ip.pop_back();
-				phase = 1;
-			}
-			else if (phase == 1) {
-				wline = convStringToWstring(buffer);
-				port = wline;
-				phase = 2;
-			}
-			else if (phase == 2) {
-				wline = convStringToWstring(buffer);
-				name = wline;
-				phase = 0;
-
-				//THEY GET DELETED AFTER USE LIKE 30 LINES UP!!
-				FriendSessionInfo* info = new FriendSessionInfo();
-				wchar_t label[128];
-				wcsncpy_s(label, sizeof(label)/sizeof(wchar_t), name.c_str(), _TRUNCATE);
-				size_t nameLen = wcslen(label);
-				info->displayLabel = new wchar_t[nameLen+1];
-				wcscpy_s(info->displayLabel, nameLen + 1, label);
-				info->displayLabelLength = (unsigned char)nameLen;
-				info->displayLabelViewableStartIndex = 0;
-				info->data.isReadyToJoin = true;
-				info->data.isJoinable = true;
-				strncpy_s(info->data.hostIP, sizeof(info->data.hostIP), ip.c_str(), _TRUNCATE);
-				info->data.hostPort = stoi(port);
-				info->sessionId = (SessionID)(static_cast<uint64_t>(inet_addr(ip.c_str())) | (static_cast<uint64_t>(stoi(port)) << 32));
-				friendsSessions[0].push_back(info);
+			if (version == 1)
+			{
+				for (uint32_t s = 0; s < count; s++)
+				{
+					uint16_t ipLen = 0, port = 0, nameLen = 0;
+					if (std::fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (ipLen == 0 || ipLen > 256) break;
+
+					char ipBuf[257] = {};
+					if (std::fread(ipBuf, 1, ipLen, file) != ipLen) break;
+					if (std::fread(&port, sizeof(uint16_t), 1, file) != 1) break;
+
+					if (std::fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (nameLen > 256) break;
+
+					char nameBuf[257] = {};
+					if (nameLen > 0)
+					{
+						if (std::fread(nameBuf, 1, nameLen, file) != nameLen) break;
+					}
+
+					wstring wName = convStringToWstring(nameBuf);
+
+					FriendSessionInfo* info = new FriendSessionInfo();
+					size_t nLen = wName.length();
+					info->displayLabel = new wchar_t[nLen + 1];
+					wcscpy_s(info->displayLabel, nLen + 1, wName.c_str());
+					info->displayLabelLength = static_cast<unsigned char>(nLen);
+					info->displayLabelViewableStartIndex = 0;
+					info->data.isReadyToJoin = true;
+					info->data.isJoinable = true;
+					strncpy_s(info->data.hostIP, sizeof(info->data.hostIP), ipBuf, _TRUNCATE);
+					info->data.hostPort = port;
+					info->sessionId = static_cast<uint64_t>(inet_addr(ipBuf)) | static_cast<uint64_t>(port) << 32;
+					friendsSessions[0].push_back(info);
+				}
 			}
 		}
-
 		std::fclose(file);
 	}
 
-	m_searchResultsCount[0] = (int)friendsSessions[0].size();
+	m_searchResultsCount[0] = static_cast<int>(friendsSessions[0].size());
 
-	if (m_SessionsUpdatedCallback != NULL)
+	if (m_SessionsUpdatedCallback != nullptr)
 		m_SessionsUpdatedCallback(m_pSearchParam);
 #endif
 }
@@ -802,7 +925,7 @@ vector<FriendSessionInfo *> *CPlatformNetworkManagerStub::GetSessionList(int iPa
 {
 	vector<FriendSessionInfo*>* filteredList = new vector<FriendSessionInfo*>();
 	for (size_t i = 0; i < friendsSessions[0].size(); i++)
-		filteredList->push_back(friendsSessions[0][i]);
+		filteredList->push_back(new FriendSessionInfo(*friendsSessions[0][i]));
 	return filteredList;
 }
 
@@ -830,7 +953,7 @@ void CPlatformNetworkManagerStub::ForceFriendsSessionRefresh()
 		m_searchResultsCount[i] = 0;
 		m_lastSearchStartTime[i] = 0;
 		delete m_pSearchResults[i];
-		m_pSearchResults[i] = NULL;
+		m_pSearchResults[i] = nullptr;
 	}
 }
 
@@ -857,7 +980,7 @@ void CPlatformNetworkManagerStub::removeNetworkPlayer(IQNetPlayer *pQNetPlayer)
 
 INetworkPlayer *CPlatformNetworkManagerStub::getNetworkPlayer(IQNetPlayer *pQNetPlayer)
 {
-	return pQNetPlayer ? (INetworkPlayer *)(pQNetPlayer->GetCustomDataValue()) : NULL;
+	return pQNetPlayer ? (INetworkPlayer *)(pQNetPlayer->GetCustomDataValue()) : nullptr;
 }
 
 
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
index 28953cec..4a3f4068 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
@@ -81,7 +81,7 @@ private:
 	GameSessionData m_hostGameSessionData;
 	CGameNetworkManager *m_pGameNetworkManager;
 public:
-	virtual void UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = NULL);
+	virtual void UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = nullptr);
 
 private:
 	// TODO 4J Stu - Do we need to be able to have more than one of these?
@@ -98,12 +98,14 @@ private:
 		INetworkPlayer *m_pNetworkPlayer;
 		unsigned char *flags;
 		unsigned int count;
+		int m_smallId;
 		PlayerFlags(INetworkPlayer *pNetworkPlayer, unsigned int count);
 		~PlayerFlags();
 	};
 	vector<PlayerFlags *> m_playerFlags;
 	void SystemFlagAddPlayer(INetworkPlayer *pNetworkPlayer);
 	void SystemFlagRemovePlayer(INetworkPlayer *pNetworkPlayer);
+	void SystemFlagRemoveBySmallId(int smallId);
 	void SystemFlagReset();
 public:
 	virtual void SystemFlagSet(INetworkPlayer *pNetworkPlayer, int index);
@@ -161,6 +163,9 @@ public:
 	virtual void GetFullFriendSessionInfo( FriendSessionInfo *foundSession, void (* FriendSessionUpdatedFn)(bool success, void *pParam), void *pParam );
 	virtual void ForceFriendsSessionRefresh();
 
+	// Win64: used by accept thread to reject connections when server is at max players (so we don't assign smallId > max).
+	bool CanAcceptMoreConnections();
+
 public:
 	void NotifyPlayerJoined( IQNetPlayer *pQNetPlayer );
 	void NotifyPlayerLeaving(IQNetPlayer* pQNetPlayer);
diff --git a/Minecraft.Client/Common/Network/SessionInfo.h b/Minecraft.Client/Common/Network/SessionInfo.h
index ce6365bc..4e091c87 100644
--- a/Minecraft.Client/Common/Network/SessionInfo.h
+++ b/Minecraft.Client/Common/Network/SessionInfo.h
@@ -113,15 +113,42 @@ public:
 
 	FriendSessionInfo()
 	{
-		displayLabel = NULL;
+		displayLabel = nullptr;
 		displayLabelLength = 0;
 		displayLabelViewableStartIndex = 0;
 		hasPartyMember = false;
 	}
 
+	FriendSessionInfo(const FriendSessionInfo& other)
+	{
+		sessionId = other.sessionId;
+#ifdef _XBOX
+		searchResult = other.searchResult;
+#elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+		searchResult = other.searchResult;
+#elif defined(_DURANGO)
+		searchResult = other.searchResult;
+#endif
+		displayLabelLength = other.displayLabelLength;
+		displayLabelViewableStartIndex = other.displayLabelViewableStartIndex;
+		data = other.data;
+		hasPartyMember = other.hasPartyMember;
+		if (other.displayLabel != NULL)
+		{
+			displayLabel = new wchar_t[displayLabelLength + 1];
+			wcscpy_s(displayLabel, displayLabelLength + 1, other.displayLabel);
+		}
+		else
+		{
+			displayLabel = NULL;
+		}
+	}
+
+	FriendSessionInfo& operator=(const FriendSessionInfo&) = delete;
+
 	~FriendSessionInfo()
 	{
-		if (displayLabel != NULL)
-			delete displayLabel;
+		if (displayLabel != nullptr)
+			delete[] displayLabel;
 	}
 };
diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.cpp b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.cpp
index a7a4628b..a1cc4038 100644
--- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.cpp
+++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.cpp
@@ -4,7 +4,7 @@
 NetworkPlayerSony::NetworkPlayerSony(SQRNetworkPlayer *qnetPlayer)
 {
 	m_sqrPlayer = qnetPlayer;
-	m_pSocket = NULL;
+	m_pSocket = nullptr;
 	m_lastChunkPacketTime = 0;
 }
 
@@ -16,12 +16,12 @@ unsigned char NetworkPlayerSony::GetSmallId()
 void NetworkPlayerSony::SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority, bool ack)
 {
 	// TODO - handle priority
-	m_sqrPlayer->SendData( ((NetworkPlayerSony *)player)->m_sqrPlayer, pvData, dataSize, ack );
+	m_sqrPlayer->SendData( static_cast<NetworkPlayerSony *>(player)->m_sqrPlayer, pvData, dataSize, ack );
 }
 
 bool NetworkPlayerSony::IsSameSystem(INetworkPlayer *player)
 {
-	return m_sqrPlayer->IsSameSystem(((NetworkPlayerSony *)player)->m_sqrPlayer);
+	return m_sqrPlayer->IsSameSystem(static_cast<NetworkPlayerSony *>(player)->m_sqrPlayer);
 }
 
 int NetworkPlayerSony::GetOutstandingAckCount()
@@ -132,6 +132,6 @@ int NetworkPlayerSony::GetTimeSinceLastChunkPacket_ms()
 		return INT_MAX;
 	}
 
-	__int64 currentTime = System::currentTimeMillis();
-	return (int)( currentTime - m_lastChunkPacketTime );
+	int64_t currentTime = System::currentTimeMillis();
+	return static_cast<int>(currentTime - m_lastChunkPacketTime);
 }
diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
index f3415a41..2c61f78d 100644
--- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
@@ -39,5 +39,5 @@ public:
 private:
 	SQRNetworkPlayer *m_sqrPlayer;
 	Socket *m_pSocket;
-	__int64 m_lastChunkPacketTime;
+	int64_t m_lastChunkPacketTime;
 };
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
index a9799d26..107101f4 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
@@ -123,7 +123,7 @@ void CPlatformNetworkManagerSony::HandleDataReceived(SQRNetworkPlayer *playerFro
 		INetworkPlayer *pPlayerFrom = getNetworkPlayer(playerFrom);
 		Socket *socket = pPlayerFrom->GetSocket();
 
-		if(socket != NULL)
+		if(socket != nullptr)
 			socket->pushDataToQueue(data, dataSize, false);
 	}
 	else
@@ -132,7 +132,7 @@ void CPlatformNetworkManagerSony::HandleDataReceived(SQRNetworkPlayer *playerFro
 		INetworkPlayer *pPlayerTo = getNetworkPlayer(playerTo);
 		Socket *socket = pPlayerTo->GetSocket();
 		//app.DebugPrintf( "Pushing data into read queue for user \"%ls\"\n", apPlayersTo[dwPlayer]->GetGamertag());
-		if(socket != NULL)
+		if(socket != nullptr)
 			socket->pushDataToQueue(data, dataSize);
 	}
 }
@@ -226,7 +226,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *
 
 	for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 	{
-		if(playerChangedCallback[idx] != NULL)
+		if(playerChangedCallback[idx] != nullptr)
 			playerChangedCallback[idx]( playerChangedCallbackParam[idx], networkPlayer, false );
 	}
 
@@ -235,7 +235,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *
 		int localPlayerCount = 0;
 		for(unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
-			if( m_pSQRNet->GetLocalPlayerByUserIndex(idx) != NULL ) ++localPlayerCount;
+			if( m_pSQRNet->GetLocalPlayerByUserIndex(idx) != nullptr ) ++localPlayerCount;
 		}
 
 		float appTime = app.getAppTime();
@@ -258,7 +258,7 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
 	{
 		// Get our wrapper object associated with this player.
 		Socket *socket = networkPlayer->GetSocket();
-		if( socket != NULL )
+		if( socket != nullptr )
 		{
 			// If we are in game then remove this player from the game as well.
 			// We may get here either from the player requesting to exit the game,
@@ -274,19 +274,19 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
 			// We need this as long as the game server still needs to communicate with the player
 			//delete socket;
 
-			networkPlayer->SetSocket( NULL );
+			networkPlayer->SetSocket( nullptr );
 		}
 
 		if( m_pSQRNet->IsHost() && !m_bHostChanged )
 		{
 			if( isSystemPrimaryPlayer(pSQRPlayer) )
 			{
-				SQRNetworkPlayer *pNewSQRPrimaryPlayer = NULL;
+				SQRNetworkPlayer *pNewSQRPrimaryPlayer = nullptr;
 				for(unsigned int i = 0; i < m_pSQRNet->GetPlayerCount(); ++i )
 				{
 					SQRNetworkPlayer *pSQRPlayer2 = m_pSQRNet->GetPlayerByIndex( i );
 
-					if ( pSQRPlayer2 != NULL && pSQRPlayer2 != pSQRPlayer && pSQRPlayer2->IsSameSystem( pSQRPlayer ) )
+					if ( pSQRPlayer2 != nullptr && pSQRPlayer2 != pSQRPlayer && pSQRPlayer2->IsSameSystem( pSQRPlayer ) )
 					{
 						pNewSQRPrimaryPlayer = pSQRPlayer2;
 						break;
@@ -298,7 +298,7 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
 					m_machineSQRPrimaryPlayers.erase( it );
 				}
 
-				if( pNewSQRPrimaryPlayer != NULL )
+				if( pNewSQRPrimaryPlayer != nullptr )
 					m_machineSQRPrimaryPlayers.push_back( pNewSQRPrimaryPlayer );
 			}
 
@@ -311,7 +311,7 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
 
 		for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
-			if(playerChangedCallback[idx] != NULL)
+			if(playerChangedCallback[idx] != nullptr)
 				playerChangedCallback[idx]( playerChangedCallbackParam[idx], networkPlayer, true );
 		}
 
@@ -320,7 +320,7 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
 			int localPlayerCount = 0;
 			for(unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 			{
-				if( m_pSQRNet->GetLocalPlayerByUserIndex(idx) != NULL ) ++localPlayerCount;
+				if( m_pSQRNet->GetLocalPlayerByUserIndex(idx) != nullptr ) ++localPlayerCount;
 			}
 
 			float appTime = app.getAppTime();
@@ -391,7 +391,7 @@ bool CPlatformNetworkManagerSony::Initialise(CGameNetworkManager *pGameNetworkMa
 	if(ProfileManager.IsSignedInPSN(ProfileManager.GetPrimaryPad()))
 	{
 		// we're signed into the PSN, but we won't be online yet, force a sign-in online here
-		m_pSQRNet_Vita->AttemptPSNSignIn(NULL, NULL);
+		m_pSQRNet_Vita->AttemptPSNSignIn(nullptr, nullptr);
 	}
 
 
@@ -402,7 +402,7 @@ bool CPlatformNetworkManagerSony::Initialise(CGameNetworkManager *pGameNetworkMa
 	g_pPlatformNetworkManager = this;
 	for( int i = 0; i < XUSER_MAX_COUNT; i++ )
 	{
-		playerChangedCallback[ i ] = NULL;
+		playerChangedCallback[ i ] = nullptr;
 	}
 
 	m_bLeavingGame = false;
@@ -413,11 +413,11 @@ bool CPlatformNetworkManagerSony::Initialise(CGameNetworkManager *pGameNetworkMa
 	m_bSearchPending = false;
 
 	m_bIsOfflineGame = false;
-	m_pSearchParam = NULL;
-	m_SessionsUpdatedCallback = NULL;
+	m_pSearchParam = nullptr;
+	m_SessionsUpdatedCallback = nullptr;
 
 	m_searchResultsCount = 0;
-	m_pSearchResults = NULL;
+	m_pSearchResults = nullptr;
 
 	m_lastSearchStartTime = 0;
 
@@ -622,11 +622,11 @@ bool CPlatformNetworkManagerSony::RemoveLocalPlayerByUserIndex( int userIndex )
 	SQRNetworkPlayer *pSQRPlayer = m_pSQRNet->GetLocalPlayerByUserIndex(userIndex);
 	INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pSQRPlayer);
 
-	if(pNetworkPlayer != NULL)
+	if(pNetworkPlayer != nullptr)
 	{
 		Socket *socket = pNetworkPlayer->GetSocket();
 
-		if( socket != NULL )
+		if( socket != nullptr )
 		{
 			// We can't remove the player from qnet until we have stopped using it to communicate
 			C4JThread* thread = new C4JThread(&CPlatformNetworkManagerSony::RemovePlayerOnSocketClosedThreadProc, pNetworkPlayer, "RemovePlayerOnSocketClosed");
@@ -702,11 +702,11 @@ bool CPlatformNetworkManagerSony::LeaveGame(bool bMigrateHost)
 	SQRNetworkPlayer *pSQRPlayer = m_pSQRNet->GetLocalPlayerByUserIndex(g_NetworkManager.GetPrimaryPad());
 	INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pSQRPlayer);
 
-	if(pNetworkPlayer != NULL)
+	if(pNetworkPlayer != nullptr)
 	{
 		Socket *socket = pNetworkPlayer->GetSocket();
 
-		if( socket != NULL )
+		if( socket != nullptr )
 		{
 			//printf("Waiting for socket closed event\n");
 			DWORD result = socket->m_socketClosedEvent->WaitForSignal(INFINITE);
@@ -718,13 +718,13 @@ bool CPlatformNetworkManagerSony::LeaveGame(bool bMigrateHost)
 				// 4J Stu - Clear our reference to this socket
 				pSQRPlayer = m_pSQRNet->GetLocalPlayerByUserIndex(g_NetworkManager.GetPrimaryPad());
 				pNetworkPlayer = getNetworkPlayer(pSQRPlayer);
-				pNetworkPlayer->SetSocket( NULL );
+				pNetworkPlayer->SetSocket( nullptr );
 			}
 			delete socket;
 		}
 		else
 		{
-			//printf("Socket is already NULL\n");
+			//printf("Socket is already nullptr\n");
 		}
 	}
 
@@ -878,8 +878,8 @@ void CPlatformNetworkManagerSony::UnRegisterPlayerChangedCallback(int iPad, void
 {
 	if(playerChangedCallbackParam[iPad] == callbackParam)
 	{
-		playerChangedCallback[iPad] = NULL;
-		playerChangedCallbackParam[iPad] = NULL;
+		playerChangedCallback[iPad] = nullptr;
+		playerChangedCallbackParam[iPad] = nullptr;
 	}
 }
 
@@ -917,7 +917,7 @@ bool CPlatformNetworkManagerSony::_RunNetworkGame()
 
 // Note that this does less than the xbox equivalent as we have HandleResyncPlayerRequest that is called by the underlying SQRNetworkManager when players are added/removed etc., so this
 // call is only used to update the game host settings & then do the final push out of the data.
-void CPlatformNetworkManagerSony::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= NULL*/)
+void CPlatformNetworkManagerSony::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= nullptr*/)
 {
 	if( this->m_bLeavingGame )
 		return;
@@ -934,7 +934,7 @@ void CPlatformNetworkManagerSony::UpdateAndSetGameSessionData(INetworkPlayer *pN
 
 	// If this is called With a pNetworkPlayerLeaving, then the call has ultimately started within SQRNetworkManager::RemoveRemotePlayersAndSync, so we don't need to sync each change
 	// as that function does a sync at the end of all changes.
-	if( pNetworkPlayerLeaving == NULL )
+	if( pNetworkPlayerLeaving == nullptr )
 	{
 		m_pSQRNet->UpdateExternalRoomData();
 	}
@@ -946,14 +946,14 @@ int CPlatformNetworkManagerSony::RemovePlayerOnSocketClosedThreadProc( void* lpP
 
 	Socket *socket = pNetworkPlayer->GetSocket();
 
-	if( socket != NULL )
+	if( socket != nullptr )
 	{
 		//printf("Waiting for socket closed event\n");
 		socket->m_socketClosedEvent->WaitForSignal(INFINITE);
 
 		//printf("Socket closed event has fired\n");
 		// 4J Stu - Clear our reference to this socket
-		pNetworkPlayer->SetSocket( NULL );
+		pNetworkPlayer->SetSocket( nullptr );
 		delete socket;
 	}
 
@@ -1030,7 +1030,7 @@ void CPlatformNetworkManagerSony::SystemFlagReset()
 void CPlatformNetworkManagerSony::SystemFlagSet(INetworkPlayer *pNetworkPlayer, int index)
 {
 	if( ( index < 0 ) || ( index >= m_flagIndexSize ) ) return;
-	if( pNetworkPlayer == NULL ) return;
+	if( pNetworkPlayer == nullptr ) return;
 
 	for( unsigned int i = 0; i < m_playerFlags.size(); i++ )
 	{
@@ -1046,7 +1046,7 @@ void CPlatformNetworkManagerSony::SystemFlagSet(INetworkPlayer *pNetworkPlayer,
 bool CPlatformNetworkManagerSony::SystemFlagGet(INetworkPlayer *pNetworkPlayer, int index)
 {
 	if( ( index < 0 ) || ( index >= m_flagIndexSize ) ) return false;
-	if( pNetworkPlayer == NULL )
+	if( pNetworkPlayer == nullptr )
 	{
 		return false;
 	}
@@ -1064,8 +1064,8 @@ bool CPlatformNetworkManagerSony::SystemFlagGet(INetworkPlayer *pNetworkPlayer,
 wstring CPlatformNetworkManagerSony::GatherStats()
 {
 #if 0
-	return L"Queue messages: " + std::to_wstring(((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( NULL, QNET_GETSENDQUEUESIZE_MESSAGES ) )
-		+ L" Queue bytes: " + std::to_wstring( ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( NULL, QNET_GETSENDQUEUESIZE_BYTES  ) );
+	return L"Queue messages: " + std::to_wstring(((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( nullptr, QNET_GETSENDQUEUESIZE_MESSAGES ) )
+		+ L" Queue bytes: " + std::to_wstring( ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( nullptr, QNET_GETSENDQUEUESIZE_BYTES  ) );
 #else
 	return L"";
 #endif
@@ -1111,7 +1111,7 @@ void CPlatformNetworkManagerSony::TickSearch()
 			}
 			m_bSearchPending = false;
 
-			if( m_SessionsUpdatedCallback != NULL ) m_SessionsUpdatedCallback(m_pSearchParam);
+			if( m_SessionsUpdatedCallback != nullptr ) m_SessionsUpdatedCallback(m_pSearchParam);
 		}
 	}
 	else
@@ -1126,7 +1126,7 @@ void CPlatformNetworkManagerSony::TickSearch()
 			if( usingAdhocMode())
 				searchDelay = 5000;
 #endif
-			if( m_SessionsUpdatedCallback != NULL && (m_lastSearchStartTime + searchDelay) < GetTickCount() )
+			if( m_SessionsUpdatedCallback != nullptr && (m_lastSearchStartTime + searchDelay) < GetTickCount() )
 			{
 				if( m_pSQRNet->FriendRoomManagerSearch() )
 				{
@@ -1189,7 +1189,7 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
 			if(memcmp( &pSearchResult->info.sessionID, &sessionId, sizeof(SessionID) ) != 0) continue;
 
 			bool foundSession = false;
-			FriendSessionInfo *sessionInfo = NULL;
+			FriendSessionInfo *sessionInfo = nullptr;
 			auto itFriendSession = friendsSessions[iPad].begin();
 			for(itFriendSession = friendsSessions[iPad].begin(); itFriendSession < friendsSessions[iPad].end(); ++itFriendSession)
 			{
@@ -1231,7 +1231,7 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
 					sessionInfo->data.isJoinable)
 				{
 					foundSessionInfo->data = sessionInfo->data;
-					if(foundSessionInfo->displayLabel != NULL) delete [] foundSessionInfo->displayLabel;
+					if(foundSessionInfo->displayLabel != nullptr) delete [] foundSessionInfo->displayLabel;
 					foundSessionInfo->displayLabel = new wchar_t[100];
 					memcpy(foundSessionInfo->displayLabel, sessionInfo->displayLabel, 100 * sizeof(wchar_t) );
 					foundSessionInfo->displayLabelLength = sessionInfo->displayLabelLength;
@@ -1267,7 +1267,7 @@ void CPlatformNetworkManagerSony::ForceFriendsSessionRefresh()
 	m_lastSearchStartTime = 0;
 	m_searchResultsCount = 0;
 	delete m_pSearchResults;
-	m_pSearchResults = NULL;
+	m_pSearchResults = nullptr;
 }
 
 INetworkPlayer *CPlatformNetworkManagerSony::addNetworkPlayer(SQRNetworkPlayer *pSQRPlayer)
@@ -1293,7 +1293,7 @@ void CPlatformNetworkManagerSony::removeNetworkPlayer(SQRNetworkPlayer *pSQRPlay
 
 INetworkPlayer *CPlatformNetworkManagerSony::getNetworkPlayer(SQRNetworkPlayer *pSQRPlayer)
 {
-	return pSQRPlayer ? (INetworkPlayer *)(pSQRPlayer->GetCustomDataValue()) : NULL;
+	return pSQRPlayer ? (INetworkPlayer *)(pSQRPlayer->GetCustomDataValue()) : nullptr;
 }
 
 
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
index 258acd83..9131e897 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
@@ -102,7 +102,7 @@ private:
 	GameSessionData m_hostGameSessionData;
 	CGameNetworkManager *m_pGameNetworkManager;
 public:
-	virtual void UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = NULL);
+	virtual void UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving = nullptr);
 
 private:
 	// TODO 4J Stu - Do we need to be able to have more than one of these?
diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.cpp b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.cpp
index f23a0a63..7561c17d 100644
--- a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.cpp
@@ -16,7 +16,7 @@ int SQRNetworkManager::GetSendQueueSizeBytes()
 	for(int i = 0; i < playerCount; ++i)
 	{
 		SQRNetworkPlayer *player = GetPlayerByIndex( i );
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			queueSize += player->GetTotalSendQueueBytes();
 		}
@@ -31,7 +31,7 @@ int SQRNetworkManager::GetSendQueueSizeMessages()
 	for(int i = 0; i < playerCount; ++i)
 	{
 		SQRNetworkPlayer *player = GetPlayerByIndex( i );
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			queueSize += player->GetTotalSendQueueMessages();
 		}
diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp
index a040b28b..4ed27824 100644
--- a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp
@@ -145,7 +145,7 @@ bool SQRNetworkPlayer::IsReady()
 {
 	return ( ( m_flags & SNP_FLAG_READY_MASK ) == SNP_FLAG_READY_MASK );
 }
-	
+
 PlayerUID SQRNetworkPlayer::GetUID()
 {
 	return m_ISD.m_UID;
@@ -224,7 +224,7 @@ void SQRNetworkPlayer::SendData( SQRNetworkPlayer *pPlayerTarget, const void *da
 {
 	AckFlags ackFlags = ack ? e_flag_AckRequested : e_flag_AckNotRequested;
 	// Our network is connected as a star. If we are the host, then we can send to any remote player. If we're a client, we can send only to the host.
-	// The host can also send to other local players, but this doesn't need to go through Rudp. 
+	// The host can also send to other local players, but this doesn't need to go through Rudp.
 	if( m_host )
 	{
 		if( ( m_type == SNP_TYPE_HOST ) && ( pPlayerTarget->m_type == SNP_TYPE_LOCAL ) )
@@ -279,14 +279,14 @@ void SQRNetworkPlayer::SendInternal(const void *data, unsigned int dataSize, Ack
 	{
 		// no data, just the flag
 		assert(dataSize == 0);
-		assert(data == NULL);
+		assert(data == nullptr);
 		int dataSize = dataRemaining;
 		if( dataSize > SNP_MAX_PAYLOAD ) dataSize = SNP_MAX_PAYLOAD;
-		sendBlock.start = NULL;
-		sendBlock.end = NULL;
-		sendBlock.current = NULL;
+		sendBlock.start = nullptr;
+		sendBlock.end = nullptr;
+		sendBlock.current = nullptr;
 		sendBlock.ack = ackFlags;
-		m_sendQueue.push(sendBlock);		
+		m_sendQueue.push(sendBlock);
 	}
 	else
 	{
@@ -299,13 +299,13 @@ void SQRNetworkPlayer::SendInternal(const void *data, unsigned int dataSize, Ack
 		sendBlock.current = sendBlock.start;
 			sendBlock.ack = ackFlags;
 		memcpy( sendBlock.start, dataCurrent, dataSize);
-		m_sendQueue.push(sendBlock);		
+		m_sendQueue.push(sendBlock);
 		dataRemaining -= dataSize;
 		dataCurrent += dataSize;
 	}
 
 	}
-	m_totalBytesInSendQueue += dataSize; 
+	m_totalBytesInSendQueue += dataSize;
 
 	// if the queue had something in it already, then the UDP callback will fire and call SendMoreInternal
 	// so we don't call it here, to avoid a deadlock
@@ -343,7 +343,7 @@ int SQRNetworkPlayer::WriteDataPacket(const void* data, int dataSize, AckFlags a
 		// nothing was sent!
 	}
 	else
-	{ 
+	{
 		assert(ret==packetSize || ret > headerSize); // we must make sure we've sent the entire packet or the header and some data at least
 		ret -= headerSize;
 		if(ackFlags == e_flag_AckRequested)
@@ -387,9 +387,9 @@ int SQRNetworkPlayer::ReadDataPacket(void* data, int dataSize)
 
 	unsigned char* packetData = new unsigned char[packetSize];
 #ifdef __PS3__
-	int bytesRead = cellRudpRead( m_rudpCtx, packetData, packetSize, 0, NULL );
+	int bytesRead = cellRudpRead( m_rudpCtx, packetData, packetSize, 0, nullptr );
 #else // __ORBIS__ && __PSVITA__
-	int bytesRead = sceRudpRead( m_rudpCtx, packetData, packetSize, 0, NULL );
+	int bytesRead = sceRudpRead( m_rudpCtx, packetData, packetSize, 0, nullptr );
 #endif
 	if(bytesRead == sc_wouldBlockFlag)
 	{
@@ -426,9 +426,9 @@ void SQRNetworkPlayer::ReadAck()
 {
 	DataPacketHeader header;
 #ifdef __PS3__
-	int bytesRead = cellRudpRead( m_rudpCtx, &header, sizeof(header), 0, NULL );
+	int bytesRead = cellRudpRead( m_rudpCtx, &header, sizeof(header), 0, nullptr );
 #else // __ORBIS__ && __PSVITA__
-	int bytesRead = sceRudpRead( m_rudpCtx, &header, sizeof(header), 0, NULL );
+	int bytesRead = sceRudpRead( m_rudpCtx, &header, sizeof(header), 0, nullptr );
 #endif
 	if(bytesRead == sc_wouldBlockFlag)
 	{
@@ -443,7 +443,7 @@ void SQRNetworkPlayer::ReadAck()
 
 #ifndef _CONTENT_PACKAGE
 #ifdef PRINT_ACK_STATS
-	__int64 timeTaken = System::currentTimeMillis() - m_ackStats[0];
+	int64_t timeTaken = System::currentTimeMillis() - m_ackStats[0];
 	if(timeTaken < m_minAckTime)
 		m_minAckTime = timeTaken;
 	if(timeTaken > m_maxAckTime)
@@ -459,7 +459,7 @@ void SQRNetworkPlayer::ReadAck()
 
 void SQRNetworkPlayer::WriteAck()
 {
-	SendInternal(NULL, 0, e_flag_AckReturning);
+	SendInternal(nullptr, 0, e_flag_AckReturning);
 }
 
 int SQRNetworkPlayer::GetOutstandingAckCount()
@@ -525,7 +525,7 @@ void SQRNetworkPlayer::SendMoreInternal()
 				{
 					keepSending = true;
 				}
-			} 
+			}
 			else if( ( ret >= 0 ) || ( ret == sc_wouldBlockFlag ) )
 			{
 
@@ -543,7 +543,7 @@ void SQRNetworkPlayer::SendMoreInternal()
 					// Is CELL_RUDP_ERROR_WOULDBLOCK, nothing has yet been sent
 					remainingBytes = dataSize;
 				}
-				m_sendQueue.front().current = m_sendQueue.front().end - remainingBytes;	
+				m_sendQueue.front().current = m_sendQueue.front().end - remainingBytes;
 			}
 		}
 	} while (keepSending);
diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h
index d0efe635..c67069d1 100644
--- a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h
+++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.h
@@ -63,16 +63,16 @@ class SQRNetworkPlayer
 	public:
 		DataPacketHeader() : m_dataSize(0), m_ackFlags(e_flag_AckUnknown) {}
 		DataPacketHeader(int dataSize, AckFlags ackFlags) : m_dataSize(dataSize), m_ackFlags(ackFlags) { }
-		AckFlags GetAckFlags() { return (AckFlags)m_ackFlags;}
+		AckFlags GetAckFlags() { return static_cast<AckFlags>(m_ackFlags);}
 		int GetDataSize() { return m_dataSize; }
 	};
 
 #ifndef _CONTENT_PACKAGE
-	std::vector<__int64> m_ackStats;
+	std::vector<int64_t> m_ackStats;
 	int m_minAckTime;
 	int m_maxAckTime;
 	int m_totalAcks;
-	__int64 m_totalAckTime;
+	int64_t m_totalAckTime;
 	int m_averageAckTime;
 #endif
 
@@ -89,7 +89,7 @@ class SQRNetworkPlayer
 	{
 	public:
 		unsigned char				m_smallId;				// Id to uniquely and permanently identify this player between machines - assigned by the server
-		PlayerUID					m_UID;			
+		PlayerUID					m_UID;
 	};
 
 	SQRNetworkPlayer(SQRNetworkManager *manager, eSQRNetworkPlayerType playerType, bool onHost, SceNpMatching2RoomMemberId roomMemberId, int localPlayerIdx, int rudpCtx, PlayerUID *pUID);
@@ -114,7 +114,7 @@ class SQRNetworkPlayer
 	int							WriteDataPacket(const void* data, int dataSize, AckFlags ackFlags);
 	void						ReadAck();
 	void						WriteAck();
-	
+
 	int							GetOutstandingAckCount();
 	int							GetSendQueueSizeBytes();
 	int							GetSendQueueSizeMessages();
diff --git a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.cpp b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.cpp
index 4468d163..47beb63c 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.cpp
@@ -25,12 +25,12 @@ static SceRemoteStorageStatus statParams;
 // {
 // 	app.DebugPrintf("remoteStorageGetCallback err : 0x%08x\n");
 // }
-// 
+//
 // void remoteStorageCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
 // {
 // 	app.DebugPrintf("remoteStorageCallback err : 0x%08x\n");
 // 
-// 	app.getRemoteStorage()->getRemoteFileInfo(&statParams, remoteStorageGetInfoCallback, NULL);
+// 	app.getRemoteStorage()->getRemoteFileInfo(&statParams, remoteStorageGetInfoCallback, nullptr);
 // }
 
 
@@ -39,13 +39,13 @@ static SceRemoteStorageStatus statParams;
 void SonyRemoteStorage::SetRetrievedDescData()
 {
 	DescriptionData* pDescDataTest = (DescriptionData*)m_remoteFileInfo->fileDescription;
-	ESavePlatform testPlatform = (ESavePlatform)MAKE_FOURCC(pDescDataTest->m_platform[0], pDescDataTest->m_platform[1], pDescDataTest->m_platform[2], pDescDataTest->m_platform[3]);
+	ESavePlatform testPlatform = static_cast<ESavePlatform>(MAKE_FOURCC(pDescDataTest->m_platform[0], pDescDataTest->m_platform[1], pDescDataTest->m_platform[2], pDescDataTest->m_platform[3]));
 	if(testPlatform == SAVE_FILE_PLATFORM_NONE)
 	{
 		// new version of the descData
 		DescriptionData_V2* pDescData2 = (DescriptionData_V2*)m_remoteFileInfo->fileDescription;
 		m_retrievedDescData.m_descDataVersion = GetU32FromHexBytes(pDescData2->m_descDataVersion);
-		m_retrievedDescData.m_savePlatform = (ESavePlatform)MAKE_FOURCC(pDescData2->m_platform[0], pDescData2->m_platform[1], pDescData2->m_platform[2], pDescData2->m_platform[3]);
+		m_retrievedDescData.m_savePlatform = static_cast<ESavePlatform>(MAKE_FOURCC(pDescData2->m_platform[0], pDescData2->m_platform[1], pDescData2->m_platform[2], pDescData2->m_platform[3]));
 		m_retrievedDescData.m_seed = GetU64FromHexBytes(pDescData2->m_seed);
 		m_retrievedDescData.m_hostOptions = GetU32FromHexBytes(pDescData2->m_hostOptions);
 		m_retrievedDescData.m_texturePack = GetU32FromHexBytes(pDescData2->m_texturePack);
@@ -58,7 +58,7 @@ void SonyRemoteStorage::SetRetrievedDescData()
 		// old version,copy the data across to the new version
 		DescriptionData* pDescData = (DescriptionData*)m_remoteFileInfo->fileDescription;
 		m_retrievedDescData.m_descDataVersion = 1;
-		m_retrievedDescData.m_savePlatform = (ESavePlatform)MAKE_FOURCC(pDescData->m_platform[0], pDescData->m_platform[1], pDescData->m_platform[2], pDescData->m_platform[3]);
+		m_retrievedDescData.m_savePlatform = static_cast<ESavePlatform>(MAKE_FOURCC(pDescData->m_platform[0], pDescData->m_platform[1], pDescData->m_platform[2], pDescData->m_platform[3]));
 		m_retrievedDescData.m_seed = GetU64FromHexBytes(pDescData->m_seed);
 		m_retrievedDescData.m_hostOptions = GetU32FromHexBytes(pDescData->m_hostOptions);
 		m_retrievedDescData.m_texturePack = GetU32FromHexBytes(pDescData->m_texturePack);
@@ -73,7 +73,7 @@ void SonyRemoteStorage::SetRetrievedDescData()
 
 void getSaveInfoReturnCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
 {
-	SonyRemoteStorage* pRemoteStorage = (SonyRemoteStorage*)lpParam;
+	SonyRemoteStorage* pRemoteStorage = static_cast<SonyRemoteStorage *>(lpParam);
 	app.DebugPrintf("remoteStorageGetInfoCallback err : 0x%08x\n", error_code);
 	if(error_code == 0)
 	{
@@ -99,7 +99,7 @@ void getSaveInfoReturnCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int
 
 static void getSaveInfoInitCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
 {
-	SonyRemoteStorage* pRemoteStorage = (SonyRemoteStorage*)lpParam;
+	SonyRemoteStorage* pRemoteStorage = static_cast<SonyRemoteStorage *>(lpParam);
 	if(error_code != 0)
 	{
 		app.DebugPrintf("getSaveInfoInitCallback err : 0x%08x\n", error_code);
@@ -143,7 +143,7 @@ bool SonyRemoteStorage::getSaveData( const char* localDirname, CallbackFunc cb,
 
 static void setSaveDataInitCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
 {
-	SonyRemoteStorage* pRemoteStorage = (SonyRemoteStorage*)lpParam;
+	SonyRemoteStorage* pRemoteStorage = static_cast<SonyRemoteStorage *>(lpParam);
 	if(error_code != 0)
 	{
 		app.DebugPrintf("setSaveDataInitCallback err : 0x%08x\n", error_code);
@@ -181,7 +181,7 @@ const char* SonyRemoteStorage::getLocalFilename()
 const char* SonyRemoteStorage::getSaveNameUTF8()
 {
 	if(m_getInfoStatus != e_infoFound)
-		return NULL;
+		return nullptr;
 	return m_retrievedDescData.m_saveNameUTF8;
 }
 
@@ -193,7 +193,7 @@ ESavePlatform SonyRemoteStorage::getSavePlatform()
 
 }
 
-__int64 SonyRemoteStorage::getSaveSeed()
+int64_t SonyRemoteStorage::getSaveSeed()
 {
 	if(m_getInfoStatus != e_infoFound)
 		return 0;
@@ -223,9 +223,9 @@ const char* SonyRemoteStorage::getRemoteSaveFilename()
 
 int SonyRemoteStorage::getSaveFilesize()
 {
-	if(m_getInfoStatus == e_infoFound) 
+	if(m_getInfoStatus == e_infoFound)
 	{
-		return m_remoteFileInfo->fileSize; 
+		return m_remoteFileInfo->fileSize;
 	}
 	return 0;
 }
@@ -244,7 +244,7 @@ bool SonyRemoteStorage::setData( PSAVE_INFO info, CallbackFunc cb, LPVOID lpPara
 
 int SonyRemoteStorage::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	SonyRemoteStorage *pClass= (SonyRemoteStorage *)lpParam;
+	SonyRemoteStorage *pClass= static_cast<SonyRemoteStorage *>(lpParam);
 
 	if(pClass->m_bAborting)
 	{
@@ -261,12 +261,12 @@ int SonyRemoteStorage::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThum
 	}
 	else
 	{
-		app.DebugPrintf("Thumbnail data is NULL, or has size 0\n");
-		pClass->m_thumbnailData = NULL;
+		app.DebugPrintf("Thumbnail data is nullptr, or has size 0\n");
+		pClass->m_thumbnailData = nullptr;
 		pClass->m_thumbnailDataSize = 0;
 	}
 
-	if(pClass->m_SetDataThread != NULL)
+	if(pClass->m_SetDataThread != nullptr)
 		delete pClass->m_SetDataThread;
 
 	pClass->m_SetDataThread = new C4JThread(setDataThread, pClass, "setDataThread");
@@ -277,7 +277,7 @@ int SonyRemoteStorage::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThum
 
 int SonyRemoteStorage::setDataThread(void* lpParam)
 {
-	SonyRemoteStorage* pClass = (SonyRemoteStorage*)lpParam;
+	SonyRemoteStorage* pClass = static_cast<SonyRemoteStorage *>(lpParam);
 	pClass->m_startTime = System::currentTimeMillis();
 	pClass->setDataInternal();
 	return 0;
@@ -288,9 +288,9 @@ bool SonyRemoteStorage::saveIsAvailable()
 	if(m_getInfoStatus != e_infoFound)
 		return false;
 #ifdef __PS3__
-	return (getSavePlatform() == SAVE_FILE_PLATFORM_PSVITA); 
+	return (getSavePlatform() == SAVE_FILE_PLATFORM_PSVITA);
 #elif defined __PSVITA__
-	return (getSavePlatform() == SAVE_FILE_PLATFORM_PS3); 
+	return (getSavePlatform() == SAVE_FILE_PLATFORM_PS3);
 #else // __ORBIS__
 	return true;
 #endif
@@ -320,10 +320,10 @@ int SonyRemoteStorage::getDataProgress()
 	int nextChunk = ((sizeTransferred + chunkSize) * 100) / totalSize;
 
 
-	__int64 time = System::currentTimeMillis();
+	int64_t time = System::currentTimeMillis();
 	int elapsedSecs = (time - m_startTime) / 1000;
-	float estimatedTransfered = float(elapsedSecs * transferRatePerSec);
-	int progVal = m_dataProgress + (estimatedTransfered / float(totalSize)) * 100;
+	float estimatedTransfered = static_cast<float>(elapsedSecs * transferRatePerSec);
+	int progVal = m_dataProgress + (estimatedTransfered / static_cast<float>(totalSize)) * 100;
 	if(progVal > nextChunk)
 		return nextChunk;
 	if(progVal > 99)
@@ -341,15 +341,15 @@ bool SonyRemoteStorage::shutdown()
 	if(m_bInitialised)
 	{
 		int ret = sceRemoteStorageTerm();
-		if(ret >= 0) 
+		if(ret >= 0)
 		{
 			app.DebugPrintf("Term request done \n");
 			m_bInitialised = false;
 			free(m_memPoolBuffer);
-			m_memPoolBuffer = NULL;
+			m_memPoolBuffer = nullptr;
 			return true;
-		} 
-		else 
+		}
+		else
 		{
 			app.DebugPrintf("Error in Term request: 0x%x \n", ret);
 			return false;
@@ -406,10 +406,11 @@ void SonyRemoteStorage::GetDescriptionData( DescriptionData& descData)
 		unsigned int uiHostOptions;
 		bool bHostOptionsRead;
 		DWORD uiTexturePack;
-		char seed[22];
-		app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack);
+        char seed[22];
+        app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize, reinterpret_cast<unsigned char*>(seed),
+                             uiHostOptions, bHostOptionsRead, uiTexturePack);
 
-		__int64 iSeed = strtoll(seed,NULL,10);
+        int64_t iSeed = strtoll(seed, nullptr,10);
 		SetU64HexBytes(descData.m_seed, iSeed);
 		// Save the host options that this world was last played with
 		SetU32HexBytes(descData.m_hostOptions, uiHostOptions);
@@ -433,7 +434,7 @@ void SonyRemoteStorage::GetDescriptionData( DescriptionData_V2& descData)
 	char descDataVersion[9];
 	sprintf(descDataVersion,"%08x",sc_CurrentDescDataVersion);
 	memcpy(descData.m_descDataVersion,descDataVersion,8); // Don't copy null
-	
+
 
 	descData.m_platform[0] = SAVE_FILE_PLATFORM_LOCAL & 0xff;
 	descData.m_platform[1] = (SAVE_FILE_PLATFORM_LOCAL >> 8) & 0xff;
@@ -448,7 +449,7 @@ void SonyRemoteStorage::GetDescriptionData( DescriptionData_V2& descData)
 		char seed[22];
 		app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack);
 
-		__int64 iSeed = strtoll(seed,NULL,10);
+		int64_t iSeed = strtoll(seed, nullptr,10);
 		SetU64HexBytes(descData.m_seed, iSeed);
 		// Save the host options that this world was last played with
 		SetU32HexBytes(descData.m_hostOptions, uiHostOptions);
@@ -468,7 +469,7 @@ void SonyRemoteStorage::GetDescriptionData( DescriptionData_V2& descData)
 uint32_t SonyRemoteStorage::GetU32FromHexBytes(char* hexBytes)
 {
 	char hexString[9];
-	ZeroMemory(hexString,9);	
+	ZeroMemory(hexString,9);
 	memcpy(hexString, hexBytes,8);
 
 	uint32_t u32Val = 0;
@@ -481,7 +482,7 @@ uint32_t SonyRemoteStorage::GetU32FromHexBytes(char* hexBytes)
 uint64_t SonyRemoteStorage::GetU64FromHexBytes(char* hexBytes)
 {
 	char hexString[17];
-	ZeroMemory(hexString,17);	
+	ZeroMemory(hexString,17);
 	memcpy(hexString, hexBytes,16);
 
 	uint64_t u64Val = 0;
diff --git a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
index d38a06e2..5740f78d 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
+++ b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
@@ -1,4 +1,4 @@
-#pragma once 
+#pragma once
 
 
 #include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h"
@@ -43,7 +43,7 @@ public:
 	char m_saveFileDesc[128];
 
 	class DescriptionData
-	{ 
+	{
 		// this stuff is read from a JSON query, so it all has to be text based, max 256 bytes
 	public:
 		char			m_platform[4];
@@ -54,7 +54,7 @@ public:
 	};
 
 	class DescriptionData_V2
-	{ 
+	{
 		// this stuff is read from a JSON query, so it all has to be text based, max 256 bytes
 	public:
 		char			m_platformNone[4];  // set to no platform, to indicate we're using the newer version of the data
@@ -73,7 +73,7 @@ public:
 	public:
 		int				m_descDataVersion;
 		ESavePlatform	m_savePlatform;
-		__int64			m_seed;
+		int64_t			m_seed;
 		uint32_t		m_hostOptions;
 		uint32_t		m_texturePack;
 		uint32_t		m_saveVersion;
@@ -115,7 +115,7 @@ public:
 	const char* getLocalFilename();
 	const char* getSaveNameUTF8();
 	ESavePlatform getSavePlatform();
-	__int64 getSaveSeed();
+	int64_t getSaveSeed();
 	unsigned int getSaveHostOptions();
 	unsigned int getSaveTexturePack();
 
@@ -140,7 +140,7 @@ public:
 	static int LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes);
 	static int setDataThread(void* lpParam);
 
-	SonyRemoteStorage() : m_memPoolBuffer(NULL), m_bInitialised(false),m_getInfoStatus(e_noInfoFound) {} 
+	SonyRemoteStorage() : m_getInfoStatus(e_noInfoFound), m_bInitialised(false),m_memPoolBuffer(nullptr) {}
 
 protected:
 	const char* getRemoteSaveFilename();
@@ -154,7 +154,7 @@ protected:
 	unsigned int m_thumbnailDataSize;
 	C4JThread* m_SetDataThread;
 	PSAVE_INFO m_setDataSaveInfo;
-	__int64 m_startTime;
+	int64_t m_startTime;
 
 	bool m_bAborting;
 	bool m_bTransferStarted;
diff --git a/Minecraft.Client/Common/PostProcesser.h b/Minecraft.Client/Common/PostProcesser.h
index ab7aedf6..966d58bc 100644
--- a/Minecraft.Client/Common/PostProcesser.h
+++ b/Minecraft.Client/Common/PostProcesser.h
@@ -45,11 +45,16 @@ private:
     bool m_wineMode = false;
     D3D11_VIEWPORT m_customViewport;
     bool m_useCustomViewport = false;
+    UINT m_gammaTexWidth = 0;
+    UINT m_gammaTexHeight = 0;
 
     struct GammaCBData
     {
         float gamma;
-        float pad[3];
+        float pad;
+        float uvOffsetX, uvOffsetY;
+        float uvScaleX, uvScaleY;
+        float pad2[2];
     };
 
     static const char* g_gammaVSCode;
diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
index 4b04b19c..5561e2a1 100644
--- a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
+++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
@@ -148,7 +148,7 @@ This should be tracked independently of saved games (restoring a save should not
 */
 INT CTelemetryManager::GetSecondsSinceInitialize()
 {
-	return (INT)(app.getAppTime() - m_initialiseTime);
+	return static_cast<INT>(app.getAppTime() - m_initialiseTime);
 }
 
 /*
@@ -165,21 +165,21 @@ INT CTelemetryManager::GetMode(DWORD dwUserId)
 	
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localplayers[dwUserId] != NULL && pMinecraft->localplayers[dwUserId]->level != NULL && pMinecraft->localplayers[dwUserId]->level->getLevelData() != NULL )
+	if( pMinecraft->localplayers[dwUserId] != nullptr && pMinecraft->localplayers[dwUserId]->level != nullptr && pMinecraft->localplayers[dwUserId]->level->getLevelData() != nullptr )
 	{
 		GameType *gameType = pMinecraft->localplayers[dwUserId]->level->getLevelData()->getGameType();
 
 		if (gameType->isSurvival())
 		{
-			mode = (INT)eTelem_ModeId_Survival;
+			mode = static_cast<INT>(eTelem_ModeId_Survival);
 		}
 		else if (gameType->isCreative())
 		{
-			mode = (INT)eTelem_ModeId_Creative;
+			mode = static_cast<INT>(eTelem_ModeId_Creative);
 		}
 		else
 		{
-			mode = (INT)eTelem_ModeId_Undefined;
+			mode = static_cast<INT>(eTelem_ModeId_Undefined);
 		}
 	}
 	return mode;
@@ -198,11 +198,11 @@ INT CTelemetryManager::GetSubMode(DWORD dwUserId)
 
 	if(Minecraft::GetInstance()->isTutorial())
 	{
-		subMode = (INT)eTelem_SubModeId_Tutorial;
+		subMode = static_cast<INT>(eTelem_SubModeId_Tutorial);
 	}
 	else
 	{
-		subMode = (INT)eTelem_SubModeId_Normal;
+		subMode = static_cast<INT>(eTelem_SubModeId_Normal);
 	}
 
 	return subMode;
@@ -220,7 +220,7 @@ INT CTelemetryManager::GetLevelId(DWORD dwUserId)
 {
 	INT levelId = (INT)eTelem_LevelId_Undefined;
 
-	levelId = (INT)eTelem_LevelId_PlayerGeneratedLevel;
+	levelId = static_cast<INT>(eTelem_LevelId_PlayerGeneratedLevel);
 
 	return levelId;
 }
@@ -237,18 +237,18 @@ INT CTelemetryManager::GetSubLevelId(DWORD dwUserId)
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if(pMinecraft->localplayers[dwUserId] != NULL)	
+	if(pMinecraft->localplayers[dwUserId] != nullptr)	
 	{
 		switch(pMinecraft->localplayers[dwUserId]->dimension)
 		{
 		case 0:
-			subLevelId = (INT)eTelem_SubLevelId_Overworld;
+			subLevelId = static_cast<INT>(eTelem_SubLevelId_Overworld);
 			break;
 		case -1:
-			subLevelId = (INT)eTelem_SubLevelId_Nether;
+			subLevelId = static_cast<INT>(eTelem_SubLevelId_Nether);
 			break;
 		case 1:
-			subLevelId = (INT)eTelem_SubLevelId_End;
+			subLevelId = static_cast<INT>(eTelem_SubLevelId_End);
 			break;
 		};
 	}
@@ -272,7 +272,7 @@ Helps differentiate level attempts when a play plays the same mode/level - espec
 */
 INT CTelemetryManager::GetLevelInstanceID()
 {
-	return (INT)m_levelInstanceID;
+	return static_cast<INT>(m_levelInstanceID);
 }
 
 /*
@@ -314,19 +314,19 @@ INT CTelemetryManager::GetSingleOrMultiplayer()
 
 	if(app.GetLocalPlayerCount() == 1 && g_NetworkManager.GetOnlinePlayerCount() == 0)
 	{
-		singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Single_Player;
+		singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Single_Player);
 	}
 	else if(app.GetLocalPlayerCount() > 1 && g_NetworkManager.GetOnlinePlayerCount() == 0)
 	{
-		singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Multiplayer_Local;
+		singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Multiplayer_Local);
 	}
 	else if(app.GetLocalPlayerCount() == 1 && g_NetworkManager.GetOnlinePlayerCount() > 0)
 	{
-		singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Multiplayer_Live;
+		singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Multiplayer_Live);
 	}
 	else if(app.GetLocalPlayerCount() > 1 && g_NetworkManager.GetOnlinePlayerCount() > 0)
 	{
-		singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Multiplayer_Both_Local_and_Live;
+		singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Multiplayer_Both_Local_and_Live);
 	}
 
 	return singleOrMultiplayer;
@@ -343,16 +343,16 @@ INT CTelemetryManager::GetDifficultyLevel(INT diff)
 	switch(diff)
 	{
 	case 0:
-		difficultyLevel = (INT)eSen_DifficultyLevel_Easiest;
+		difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Easiest);
 		break;
 	case 1:
-		difficultyLevel = (INT)eSen_DifficultyLevel_Easier;
+		difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Easier);
 		break;
 	case 2:
-		difficultyLevel = (INT)eSen_DifficultyLevel_Normal;
+		difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Normal);
 		break;
 	case 3:
-		difficultyLevel = (INT)eSen_DifficultyLevel_Harder;
+		difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Harder);
 		break;
 	}
 
@@ -372,11 +372,11 @@ INT CTelemetryManager::GetLicense()
 
 	if(ProfileManager.IsFullVersion())
 	{
-		license = (INT)eSen_License_Full_Purchased_Title;
+		license = static_cast<INT>(eSen_License_Full_Purchased_Title);
 	}
 	else
 	{
-		license = (INT)eSen_License_Trial_or_Demo;
+		license = static_cast<INT>(eSen_License_Trial_or_Demo);
 	}
 	return license;
 }
@@ -411,15 +411,15 @@ INT CTelemetryManager::GetAudioSettings(DWORD dwUserId)
 
 		if(volume == 0)
 		{
-			audioSettings = (INT)eSen_AudioSettings_Off;
+			audioSettings = static_cast<INT>(eSen_AudioSettings_Off);
 		}
 		else if(volume == DEFAULT_VOLUME_LEVEL)
 		{
-			audioSettings = (INT)eSen_AudioSettings_On_Default;
+			audioSettings = static_cast<INT>(eSen_AudioSettings_On_Default);
 		}
 		else
 		{
-			audioSettings = (INT)eSen_AudioSettings_On_CustomSetting;
+			audioSettings = static_cast<INT>(eSen_AudioSettings_On_CustomSetting);
 		}
 	}
 	return audioSettings;
diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
index f01db84e..06e73d6f 100644
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
@@ -61,9 +61,9 @@ void ChangeStateConstraint::tick(int iPad)
 				// Send update settings packet to server
 				Minecraft *pMinecraft = Minecraft::GetInstance();				
 				shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
-				if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
+				if(player != nullptr && player->connection && player->connection->getNetworkPlayer() != nullptr)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs));
 				}
 			}
 		}
@@ -89,7 +89,7 @@ void ChangeStateConstraint::tick(int iPad)
 
 		if(m_changeGameMode)
 		{
-			if(minecraft->localgameModes[iPad] != NULL)
+			if(minecraft->localgameModes[iPad] != nullptr)
 			{
 				m_changedFromGameMode = minecraft->localplayers[iPad]->abilities.instabuild ? GameType::CREATIVE : GameType::SURVIVAL;
 
@@ -102,9 +102,9 @@ void ChangeStateConstraint::tick(int iPad)
 					// Send update settings packet to server
 					Minecraft *pMinecraft = Minecraft::GetInstance();				
 					shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
-					if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
+					if(player != nullptr && player->connection && player->connection->getNetworkPlayer() != nullptr)
 					{
-						player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
+						player->connection->send(std::make_shared<PlayerInfoPacket>(player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs));
 					}
 				}
 			}
@@ -126,9 +126,9 @@ void ChangeStateConstraint::tick(int iPad)
 				// Send update settings packet to server
 				Minecraft *pMinecraft = Minecraft::GetInstance();				
 				shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
-				if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
+				if(player != nullptr && player->connection && player->connection->getNetworkPlayer() != nullptr)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs));
 				}
 			}
 		}
diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.h b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.h
index 2156870d..e5f2d74b 100644
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.h
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.h
@@ -30,7 +30,7 @@ private:
 public:
 	virtual ConstraintType getType() { return e_ConstraintChangeState; }
 
-	ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, double x0, double y0, double z0, double x1, double y1, double z1, bool contains = true, bool changeGameMode = false, GameType *targetGameMode = NULL );
+	ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, double x0, double y0, double z0, double x1, double y1, double z1, bool contains = true, bool changeGameMode = false, GameType *targetGameMode = nullptr );
 	~ChangeStateConstraint();
 
 	virtual void tick(int iPad);
diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
index 1ea34ace..023e4b22 100644
--- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
@@ -8,11 +8,12 @@
 #include "ChoiceTask.h"
 #include "..\..\..\Minecraft.World\Material.h"
 #include "..\..\Windows64\KeyboardMouseInput.h"
+#include "Common/UI/UI.h"
 
 ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
-	int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
-	eTutorial_CompletionAction cancelAction /*= e_Tutorial_Completion_None*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
-	: TutorialTask( tutorial, descriptionId, false, NULL, true, false, false )
+                       int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
+                       eTutorial_CompletionAction cancelAction /*= e_Tutorial_Completion_None*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
+	: TutorialTask( tutorial, descriptionId, false, nullptr, true, false, false )
 {
 	if(requiresUserInput == true)
 	{
diff --git a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
index 43b2f7f3..f2fb8c12 100644
--- a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
@@ -3,7 +3,7 @@
 #include "CompleteUsingItemTask.h"
 
 CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)
-	: TutorialTask( tutorial, descriptionId, enablePreCompletion, NULL)
+	: TutorialTask( tutorial, descriptionId, enablePreCompletion, nullptr)
 {	
 	m_iValidItemsA= new int [itemIdsLength];
 	for(int i=0;i<itemIdsLength;i++)
diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
index 379e117c..ddb07050 100644
--- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
@@ -9,7 +9,7 @@
 
 ControllerTask::ControllerTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, bool showMinimumTime,
 								int mappings[], unsigned int mappingsLength, int iCompletionMaskA[], int iCompletionMaskACount, int iSouthpawMappings[], unsigned int uiSouthpawMappingsCount)
-	: TutorialTask( tutorial, descriptionId, enablePreCompletion, NULL, showMinimumTime )
+	: TutorialTask( tutorial, descriptionId, enablePreCompletion, nullptr, showMinimumTime )
 {
 	for(unsigned int i = 0; i < mappingsLength; ++i)
 	{
diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.h b/Minecraft.Client/Common/Tutorial/ControllerTask.h
index 1ee6746f..8cf8f5c6 100644
--- a/Minecraft.Client/Common/Tutorial/ControllerTask.h
+++ b/Minecraft.Client/Common/Tutorial/ControllerTask.h
@@ -16,7 +16,7 @@ private:
 	bool CompletionMaskIsValid();
 public:
 	ControllerTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion,  bool showMinimumTime,
-				int mappings[], unsigned int mappingsLength, int iCompletionMaskA[]=NULL, int iCompletionMaskACount=0, int iSouthpawMappings[]=NULL, unsigned int uiSouthpawMappingsCount=0);
+				int mappings[], unsigned int mappingsLength, int iCompletionMaskA[]=nullptr, int iCompletionMaskACount=0, int iSouthpawMappings[]=nullptr, unsigned int uiSouthpawMappingsCount=0);
 	~ControllerTask();
 	virtual bool isCompleted();
 	virtual void setAsCurrentTask(bool active = true);
diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Common/Tutorial/CraftTask.cpp
index 6749d030..c96e6872 100644
--- a/Minecraft.Client/Common/Tutorial/CraftTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/CraftTask.cpp
@@ -3,7 +3,7 @@
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 CraftTask::CraftTask( int itemId, int auxValue, int  quantity,
-	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
+	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= nullptr*/,
 	bool bShowMinimumTime /*=false*/,  bool bAllowFade /*=true*/, bool m_bTaskReminders /*=true*/ )
 	: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime,  bAllowFade, m_bTaskReminders ),
 	m_quantity( quantity ),
@@ -17,7 +17,7 @@ CraftTask::CraftTask( int itemId, int auxValue, int  quantity,
 }
 
 CraftTask::CraftTask( int *items, int *auxValues, int numItems, int  quantity,
-	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
+	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= nullptr*/,
 	bool bShowMinimumTime /*=false*/,  bool bAllowFade /*=true*/, bool m_bTaskReminders /*=true*/ )
 	: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime,  bAllowFade, m_bTaskReminders ),
 	m_quantity( quantity ),
diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.h b/Minecraft.Client/Common/Tutorial/CraftTask.h
index 1496f07a..4246711e 100644
--- a/Minecraft.Client/Common/Tutorial/CraftTask.h
+++ b/Minecraft.Client/Common/Tutorial/CraftTask.h
@@ -5,10 +5,10 @@ class CraftTask : public TutorialTask
 {
 public:
 	CraftTask( int itemId, int auxValue, int  quantity,
-		Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = NULL,
+		Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = nullptr,
 		bool bShowMinimumTime=false,  bool bAllowFade=true, bool m_bTaskReminders=true );
 	CraftTask( int *items, int *auxValues, int numItems, int  quantity,
-		Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = NULL,
+		Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = nullptr,
 		bool bShowMinimumTime=false,  bool bAllowFade=true, bool m_bTaskReminders=true );
 
 	~CraftTask();
diff --git a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
index 86dbe500..428bbe3c 100644
--- a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
@@ -22,7 +22,7 @@ DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial *tutorial, int descri
 
 int DiggerItemHint::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
 {
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		bool itemFound = false;
 		for(unsigned int i=0;i<m_iItemsCount;i++)
@@ -48,7 +48,7 @@ int DiggerItemHint::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
 
 int DiggerItemHint::attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> entity)
 {
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		bool itemFound = false;
 		for(unsigned int i=0;i<m_iItemsCount;i++)
diff --git a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
index 5f1b5b20..4a027b6c 100644
--- a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
@@ -4,7 +4,7 @@
 
 EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,
 		bool enablePreCompletion, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders )
-		: TutorialTask(tutorial,descriptionId,enablePreCompletion,NULL,bShowMinimumTime,bAllowFade,bTaskReminders)
+		: TutorialTask(tutorial,descriptionId,enablePreCompletion,nullptr,bShowMinimumTime,bAllowFade,bTaskReminders)
 {
 	m_effect = effect;
 	m_apply = apply;
diff --git a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
index d0fda62e..a6e1ebb7 100644
--- a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
+++ b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
@@ -154,10 +154,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	addTask(e_Tutorial_State_Gameplay, new UseItemTask(Item::door_wood->id, this, IDS_TUTORIAL_TASK_PLACE_DOOR) );
 	addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::torch_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_TORCH) );
 
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tutorialArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			vector<TutorialConstraint *> *areaConstraints = new vector<TutorialConstraint *>();
 			areaConstraints->push_back( new AreaConstraint( IDS_TUTORIAL_CONSTRAINT_TUTORIAL_AREA, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -283,10 +283,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* MINECART
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"minecartArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Riding_Minecart, IDS_TUTORIAL_HINT_MINECART, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
 		}
@@ -298,10 +298,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* BOAT
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"boatArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Riding_Boat, IDS_TUTORIAL_HINT_BOAT, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
 		}
@@ -313,10 +313,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* FISHING
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"fishingArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Fishing, IDS_TUTORIAL_HINT_FISHING, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
 		}
@@ -328,10 +328,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* PISTON - SELF-REPAIRING BRIDGE
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"pistonBridgeArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_None, IDS_TUTORIAL_HINT_PISTON_SELF_REPAIRING_BRIDGE, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1, true ) );
 		}
@@ -343,10 +343,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* PISTON - PISTON AND REDSTONE CIRCUITS
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"pistonArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State redstoneAndPistonStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Redstone_And_Piston, redstoneAndPistonStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -368,10 +368,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* PORTAL
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"portalArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State portalStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Portal, portalStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -391,10 +391,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* CREATIVE
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"creativeArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State creativeStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_CreativeMode, creativeStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1,true,true,GameType::CREATIVE) );
@@ -411,7 +411,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 			ProcedureCompoundTask *creativeFinalTask = new ProcedureCompoundTask( this );
 
 			AABB *exitArea = app.getGameRuleDefinitions()->getNamedArea(L"creativeExitArea");
-			if(exitArea != NULL)
+			if(exitArea != nullptr)
 			{
 				vector<TutorialConstraint *> *creativeExitAreaConstraints = new vector<TutorialConstraint *>();
 				creativeExitAreaConstraints->push_back( new AreaConstraint( -1, exitArea->x0,exitArea->y0,exitArea->z0,exitArea->x1,exitArea->y1,exitArea->z1,true,false) );
@@ -434,10 +434,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* BREWING
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"brewingArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State brewingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Brewing, brewingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -467,10 +467,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* ENCHANTING
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"enchantingArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Enchanting, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -492,10 +492,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* ANVIL
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"anvilArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Anvil, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -517,10 +517,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* TRADING
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tradingArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State tradingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Trading, tradingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -541,10 +541,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* FIREWORKS
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"fireworksArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State fireworkStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Fireworks, fireworkStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -563,10 +563,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* BEACON
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"beaconArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State beaconStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Beacon, beaconStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -585,10 +585,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* HOPPER
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"hopperArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State hopperStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Hopper, hopperStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -610,10 +610,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* ENDERCHEST
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"enderchestArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Enderchests, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -632,10 +632,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* FARMING
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"farmingArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State farmingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Farming, farmingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -661,10 +661,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* BREEDING
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"breedingArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State breedingStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Breeding, breedingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -689,10 +689,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
 	* SNOW AND IRON GOLEM
 	*
 	*/
-	if(app.getGameRuleDefinitions() != NULL)
+	if(app.getGameRuleDefinitions() != nullptr)
 	{
 		AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"golemArea");
-		if(area != NULL)
+		if(area != nullptr)
 		{
 			eTutorial_State golemStates[] = {e_Tutorial_State_Gameplay};
 			AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Golem, golemStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
diff --git a/Minecraft.Client/Common/Tutorial/FullTutorialActiveTask.cpp b/Minecraft.Client/Common/Tutorial/FullTutorialActiveTask.cpp
index 54985d21..f1357c6c 100644
--- a/Minecraft.Client/Common/Tutorial/FullTutorialActiveTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/FullTutorialActiveTask.cpp
@@ -3,7 +3,7 @@
 #include "FullTutorialActiveTask.h"
 
 FullTutorialActiveTask::FullTutorialActiveTask(Tutorial *tutorial, eTutorial_CompletionAction completeAction /*= e_Tutorial_Completion_None*/)
-	: TutorialTask( tutorial, -1, false, NULL, false, false, false )
+	: TutorialTask( tutorial, -1, false, nullptr, false, false, false )
 {
 	m_completeAction = completeAction;
 }
diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
index 6a78ed92..2e481804 100644
--- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
@@ -8,10 +8,11 @@
 #include "InfoTask.h"
 #include "..\..\..\Minecraft.World\Material.h"
 #include "..\..\Windows64\KeyboardMouseInput.h"
+#include "Common/UI/UI.h"
 
 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
-	int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
-	: TutorialTask( tutorial, descriptionId, false, NULL, true, false, false )
+                   int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
+	: TutorialTask( tutorial, descriptionId, false, nullptr, true, false, false )
 {
 	if(requiresUserInput == true)
 	{
diff --git a/Minecraft.Client/Common/Tutorial/PickupTask.h b/Minecraft.Client/Common/Tutorial/PickupTask.h
index 68e1d479..9f2d2426 100644
--- a/Minecraft.Client/Common/Tutorial/PickupTask.h
+++ b/Minecraft.Client/Common/Tutorial/PickupTask.h
@@ -8,7 +8,7 @@ class PickupTask : public TutorialTask
 {
 public:
 	PickupTask( int itemId, unsigned int  quantity, int auxValue,
-		Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = NULL,
+		Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = nullptr,
 		bool bShowMinimumTime=false,  bool bAllowFade=true, bool m_bTaskReminders=true )
 		: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime,  bAllowFade, m_bTaskReminders ),
 		m_itemId( itemId),
diff --git a/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp b/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp
index 0e3b3e37..ddf15a55 100644
--- a/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp
@@ -11,7 +11,7 @@ ProcedureCompoundTask::~ProcedureCompoundTask()
 
 void ProcedureCompoundTask::AddTask(TutorialTask *task)
 {
-	if(task != NULL)
+	if(task != nullptr)
 	{
 		m_taskSequence.push_back(task);
 	}
diff --git a/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.h b/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.h
index 36b32798..0a5b7eee 100644
--- a/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.h
+++ b/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.h
@@ -8,7 +8,7 @@ class ProcedureCompoundTask : public TutorialTask
 {
 public:
 	ProcedureCompoundTask(Tutorial *tutorial )
-		: TutorialTask(tutorial, -1, false, NULL, false,  true, false )
+		: TutorialTask(tutorial, -1, false, nullptr, false,  true, false )
 	{}
 
 	~ProcedureCompoundTask();
diff --git a/Minecraft.Client/Common/Tutorial/ProgressFlagTask.h b/Minecraft.Client/Common/Tutorial/ProgressFlagTask.h
index b96e1bc0..9baea5a5 100644
--- a/Minecraft.Client/Common/Tutorial/ProgressFlagTask.h
+++ b/Minecraft.Client/Common/Tutorial/ProgressFlagTask.h
@@ -17,7 +17,7 @@ private:
 	EProgressFlagType m_type;
 public:
 	ProgressFlagTask(char *flags, char mask, EProgressFlagType type, Tutorial *tutorial ) :
-	TutorialTask(tutorial, -1, false, NULL ),
+	TutorialTask(tutorial, -1, false, nullptr ),
 		flags( flags ), m_mask( mask ), m_type( type )
 	{}
 
diff --git a/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
index 29fe592d..29b77645 100644
--- a/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
@@ -23,7 +23,7 @@ bool RideEntityTask::isCompleted()
 
 void RideEntityTask::onRideEntity(shared_ptr<Entity> entity)
 {
-	if (entity->instanceof((eINSTANCEOF) m_eType))
+	if (entity->instanceof(static_cast<eINSTANCEOF>(m_eType)))
 	{
 		bIsCompleted = true;
 	}
diff --git a/Minecraft.Client/Common/Tutorial/RideEntityTask.h b/Minecraft.Client/Common/Tutorial/RideEntityTask.h
index d9b6d41e..749b187f 100644
--- a/Minecraft.Client/Common/Tutorial/RideEntityTask.h
+++ b/Minecraft.Client/Common/Tutorial/RideEntityTask.h
@@ -13,7 +13,7 @@ protected:
 
 public:
 	RideEntityTask(const int eTYPE, Tutorial *tutorial, int descriptionId,
-		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL,
+		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr,
 		bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
 
 	virtual bool isCompleted();
diff --git a/Minecraft.Client/Common/Tutorial/StatTask.cpp b/Minecraft.Client/Common/Tutorial/StatTask.cpp
index 5f8b215e..c2dc82aa 100644
--- a/Minecraft.Client/Common/Tutorial/StatTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/StatTask.cpp
@@ -6,7 +6,7 @@
 #include "StatTask.h"
 
 StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)
-	: TutorialTask( tutorial, descriptionId, enablePreCompletion, NULL )
+	: TutorialTask( tutorial, descriptionId, enablePreCompletion, nullptr )
 {
 	this->stat = stat;
 
@@ -20,6 +20,6 @@ bool StatTask::isCompleted()
 		return true;
 
 	Minecraft *minecraft = Minecraft::GetInstance();
-	bIsCompleted = minecraft->stats[ProfileManager.GetPrimaryPad()]->getTotalValue( stat ) >= (unsigned int)targetValue;
+	bIsCompleted = minecraft->stats[ProfileManager.GetPrimaryPad()]->getTotalValue( stat ) >= static_cast<unsigned int>(targetValue);
 	return bIsCompleted;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Tutorial/StateChangeTask.h b/Minecraft.Client/Common/Tutorial/StateChangeTask.h
index fb9e6396..ab34d35d 100644
--- a/Minecraft.Client/Common/Tutorial/StateChangeTask.h
+++ b/Minecraft.Client/Common/Tutorial/StateChangeTask.h
@@ -9,7 +9,7 @@ private:
 	eTutorial_State m_state;
 public:
 	StateChangeTask(eTutorial_State state,
-		Tutorial *tutorial, int descriptionId = -1, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL,
+		Tutorial *tutorial, int descriptionId = -1, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr,
 		bool bShowMinimumTime=false,  bool bAllowFade=true, bool m_bTaskReminders=true ) :
 	TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime,  bAllowFade, m_bTaskReminders ),
 		m_state( state )
diff --git a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
index a1a5c37a..3a318488 100644
--- a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
@@ -19,7 +19,7 @@ TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial *tutorial, int items[], u
 
 bool TakeItemHint::onTake(shared_ptr<ItemInstance> item)
 {
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		bool itemFound = false;
 		for(unsigned int i=0;i<m_iItemsCount;i++)
diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp
index 60feba11..c985ef49 100644
--- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp
+++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp
@@ -17,6 +17,7 @@
 #include "TutorialTasks.h"
 #include "TutorialConstraints.h"
 #include "TutorialHints.h"
+#include "Common/UI/UI.h"
 
 vector<int> Tutorial::s_completableTasks;
 
@@ -31,7 +32,7 @@ int Tutorial::m_iTutorialFreezeTimeValue = 8000;
 
 bool Tutorial::PopupMessageDetails::isSameContent(PopupMessageDetails *other)
 {
-	if(other == NULL) return false;
+	if(other == nullptr) return false;
 
 	bool textTheSame = (m_messageId == other->m_messageId) && (m_messageString.compare(other->m_messageString) == 0);
 	bool titleTheSame = (m_titleId == other->m_titleId) && (m_titleString.compare(other->m_titleString) == 0);
@@ -360,12 +361,12 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
 	m_hintDisplayed = false;
 	m_freezeTime = false;
 	m_timeFrozen = false;
-	m_UIScene = NULL;
+	m_UIScene = nullptr;
 	m_allowShow = true;
 	m_bHasTickedOnce = false;
 	m_firstTickTime = 0;
 
-	m_lastMessage = NULL;
+	m_lastMessage = nullptr;
 
 	lastMessageTime = 0;
 	m_iTaskReminders = 0;
@@ -374,13 +375,13 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
 	m_CurrentState = e_Tutorial_State_Gameplay;
 	m_hasStateChanged = false;
 #ifdef _XBOX
-	m_hTutorialScene=NULL;
+	m_hTutorialScene=nullptr;
 #endif
 
 	for(unsigned int i = 0; i < e_Tutorial_State_Max; ++i)
 	{
-		currentTask[i] = NULL;
-		currentFailedConstraint[i] = NULL;
+		currentTask[i] = nullptr;
+		currentFailedConstraint[i] = nullptr;
 	}
 
 	// DEFAULT TASKS THAT ALL TUTORIALS SHARE
@@ -1012,7 +1013,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
 		addTask(e_Tutorial_State_Horse, new InfoTask(this, IDS_TUTORIAL_TASK_HORSE_TAMING2,		IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) );
 
 		// 4J-JEV: Only force the RideEntityTask if we're on the full-tutorial.
-		if (isFullTutorial)	addTask(e_Tutorial_State_Horse, new RideEntityTask(eTYPE_HORSE, this, IDS_TUTORIAL_TASK_HORSE_RIDE, true, NULL, false, false, false) );
+		if (isFullTutorial)	addTask(e_Tutorial_State_Horse, new RideEntityTask(eTYPE_HORSE, this, IDS_TUTORIAL_TASK_HORSE_RIDE, true, nullptr, false, false, false) );
 		else				addTask(e_Tutorial_State_Horse, new InfoTask(this, IDS_TUTORIAL_TASK_HORSE_RIDE,	IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) );
 
 		addTask(e_Tutorial_State_Horse, new InfoTask(this, IDS_TUTORIAL_TASK_HORSE_SADDLES,		IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) );
@@ -1163,8 +1164,8 @@ Tutorial::~Tutorial()
 			delete it;
 		}
 
-		currentTask[i] = NULL;
-		currentFailedConstraint[i] = NULL;
+		currentTask[i] = nullptr;
+		currentFailedConstraint[i] = nullptr;
 	}
 }
 
@@ -1173,7 +1174,7 @@ void Tutorial::debugResetPlayerSavedProgress(int iPad)
 #if ( defined  __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
 	GAME_SETTINGS *pGameSettings = (GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(iPad);
 #else
-	GAME_SETTINGS *pGameSettings = (GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(iPad);
+	GAME_SETTINGS *pGameSettings = static_cast<GAME_SETTINGS *>(ProfileManager.GetGameDefinedProfileData(iPad));
 #endif
 	ZeroMemory( pGameSettings->ucTutorialCompletion, TUTORIAL_PROFILE_STORAGE_BYTES );
 	pGameSettings->uiSpecialTutorialBitmask = 0;
@@ -1202,7 +1203,7 @@ void Tutorial::setCompleted( int completableId )
 #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 		GAME_SETTINGS *pGameSettings = (GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(m_iPad);
 #else
-		GAME_SETTINGS *pGameSettings = (GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(m_iPad);
+		GAME_SETTINGS *pGameSettings = static_cast<GAME_SETTINGS *>(ProfileManager.GetGameDefinedProfileData(m_iPad));
 #endif
 		int arrayIndex = completableIndex >> 3;
 		int bitIndex = 7 - (completableIndex % 8);
@@ -1235,7 +1236,7 @@ bool Tutorial::getCompleted( int completableId )
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 		GAME_SETTINGS *pGameSettings = (GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(m_iPad);
 #else
-		GAME_SETTINGS *pGameSettings = (GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(m_iPad);
+		GAME_SETTINGS *pGameSettings = static_cast<GAME_SETTINGS *>(ProfileManager.GetGameDefinedProfileData(m_iPad));
 #endif
 		int arrayIndex = completableIndex >> 3;
 		int bitIndex = 7 - (completableIndex % 8);
@@ -1362,7 +1363,7 @@ void Tutorial::tick()
 
 	if(!m_allowShow)
 	{
-		if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
+		if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
 		{
 			uiTempDisabled = true;
 		}
@@ -1412,7 +1413,7 @@ void Tutorial::tick()
 
 	if(ui.IsPauseMenuDisplayed( m_iPad ) )
 	{
-		if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
+		if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
 		{
 			uiTempDisabled = true;
 		}
@@ -1460,12 +1461,12 @@ void Tutorial::tick()
 
 	// Check constraints
 	// Only need to update these if we aren't already failing something
-	if( !m_allTutorialsComplete && (currentFailedConstraint[m_CurrentState] == NULL || currentFailedConstraint[m_CurrentState]->isConstraintSatisfied(m_iPad)) )
+	if( !m_allTutorialsComplete && (currentFailedConstraint[m_CurrentState] == nullptr || currentFailedConstraint[m_CurrentState]->isConstraintSatisfied(m_iPad)) )
 	{
-		if( currentFailedConstraint[m_CurrentState] != NULL && currentFailedConstraint[m_CurrentState]->isConstraintSatisfied(m_iPad) )
+		if( currentFailedConstraint[m_CurrentState] != nullptr && currentFailedConstraint[m_CurrentState]->isConstraintSatisfied(m_iPad) )
 		{
 			constraintChanged = true;
-			currentFailedConstraint[m_CurrentState] = NULL;
+			currentFailedConstraint[m_CurrentState] = nullptr;
 		}
         for (auto& constraint : constraints[m_CurrentState])
         {
@@ -1477,7 +1478,7 @@ void Tutorial::tick()
 		}
 	}
 
-	if( !m_allTutorialsComplete && currentFailedConstraint[m_CurrentState] == NULL )
+	if( !m_allTutorialsComplete && currentFailedConstraint[m_CurrentState] == nullptr )
 	{
 		// Update tasks
 		bool isCurrentTask = true;
@@ -1496,7 +1497,7 @@ void Tutorial::tick()
 					eTutorial_CompletionAction compAction = task->getCompletionAction();
 					it = activeTasks[m_CurrentState].erase( it );
 					delete task;
-					task = NULL;
+					task = nullptr;
 
 					if( activeTasks[m_CurrentState].size() > 0 )
 					{
@@ -1552,12 +1553,12 @@ void Tutorial::tick()
 					{
 						setStateCompleted( m_CurrentState );
 
-						currentTask[m_CurrentState] = NULL;
+						currentTask[m_CurrentState] = nullptr;
 					}
 					taskChanged = true;
 
 					// If we can complete this early, check if we can complete it right now
-					if( currentTask[m_CurrentState] != NULL && currentTask[m_CurrentState]->isPreCompletionEnabled() )
+					if( currentTask[m_CurrentState] != nullptr && currentTask[m_CurrentState]->isPreCompletionEnabled() )
 					{
 						isCurrentTask = true;
 					}
@@ -1566,7 +1567,7 @@ void Tutorial::tick()
 				{
 					++it;
 				}
-				if( task != NULL && task->ShowMinimumTime() && task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount() )
+				if( task != nullptr && task->ShowMinimumTime() && task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount() )
 				{
 					task->setShownForMinimumTime();
 
@@ -1587,7 +1588,7 @@ void Tutorial::tick()
 			}
 		}
 
-		if( currentTask[m_CurrentState] == NULL && activeTasks[m_CurrentState].size() > 0 )
+		if( currentTask[m_CurrentState] == nullptr && activeTasks[m_CurrentState].size() > 0 )
 		{
 			currentTask[m_CurrentState] = activeTasks[m_CurrentState][0];
 			currentTask[m_CurrentState]->setAsCurrentTask();
@@ -1616,17 +1617,17 @@ void Tutorial::tick()
 	}
 
 	if( constraintChanged || taskChanged || m_hasStateChanged ||
-		(currentFailedConstraint[m_CurrentState] == NULL && currentTask[m_CurrentState] != NULL && (m_lastMessage == NULL || currentTask[m_CurrentState]->getDescriptionId() != m_lastMessage->m_messageId) && !m_hintDisplayed)
+		(currentFailedConstraint[m_CurrentState] == nullptr && currentTask[m_CurrentState] != nullptr && (m_lastMessage == nullptr || currentTask[m_CurrentState]->getDescriptionId() != m_lastMessage->m_messageId) && !m_hintDisplayed)
 		)
 	{
-		if( currentFailedConstraint[m_CurrentState] != NULL )
+		if( currentFailedConstraint[m_CurrentState] != nullptr )
 		{
 			PopupMessageDetails *message = new PopupMessageDetails();
 			message->m_messageId = currentFailedConstraint[m_CurrentState]->getDescriptionId();
 			message->m_allowFade = false;
 			setMessage( message );
 		}
-		else if( currentTask[m_CurrentState] != NULL )
+		else if( currentTask[m_CurrentState] != nullptr )
 		{
 			PopupMessageDetails *message = new PopupMessageDetails();
 			message->m_messageId = currentTask[m_CurrentState]->getDescriptionId();
@@ -1637,7 +1638,7 @@ void Tutorial::tick()
 		}
 		else
 		{
-			setMessage( NULL );
+			setMessage( nullptr );
 		}
 	}
 
@@ -1646,7 +1647,7 @@ void Tutorial::tick()
 		m_hintDisplayed = false;
 	}
 
-	if( currentFailedConstraint[m_CurrentState] == NULL && currentTask[m_CurrentState] != NULL && (m_iTaskReminders!=0) && (lastMessageTime + (m_iTaskReminders * m_iTutorialReminderTime) ) < GetTickCount() )
+	if( currentFailedConstraint[m_CurrentState] == nullptr && currentTask[m_CurrentState] != nullptr && (m_iTaskReminders!=0) && (lastMessageTime + (m_iTaskReminders * m_iTutorialReminderTime) ) < GetTickCount() )
 	{
 		// Reminder
 		PopupMessageDetails *message = new PopupMessageDetails();
@@ -1671,7 +1672,7 @@ void Tutorial::tick()
 
 bool Tutorial::setMessage(PopupMessageDetails *message)
 {
-	if(message != NULL && !message->m_forceDisplay &&
+	if(message != nullptr && !message->m_forceDisplay &&
 		m_lastMessageState == m_CurrentState &&
 		message->isSameContent(m_lastMessage) &&
 		( !message->m_isReminder || ( (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount() && message->m_isReminder ) )
@@ -1681,7 +1682,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
 		return false;
 	}
 
-	if(message != NULL && (message->m_messageId > 0 || !message->m_messageString.empty()) )
+	if(message != nullptr && (message->m_messageId > 0 || !message->m_messageString.empty()) )
 	{
 		m_lastMessageState = m_CurrentState;
 
@@ -1695,7 +1696,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
 		else
 		{
             auto it = messages.find(message->m_messageId);
-            if( it != messages.end() && it->second != NULL )
+            if( it != messages.end() && it->second != nullptr )
 			{
 				TutorialMessage *messageString = it->second;
 				text = wstring( messageString->getMessageForDisplay() );
@@ -1725,7 +1726,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
 		else if(message->m_promptId >= 0)
 		{
             auto it = messages.find(message->m_promptId);
-            if(it != messages.end() && it->second != NULL)
+            if(it != messages.end() && it->second != nullptr)
 			{
 				TutorialMessage *prompt = it->second;
 				text.append( prompt->getMessageForDisplay() );
@@ -1754,7 +1755,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
 			ui.SetTutorialDescription( m_iPad, &popupInfo );
 		}
 	}
-	else if( (m_lastMessage != NULL && m_lastMessage->m_messageId != -1) ) //&& (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount() )
+	else if( (m_lastMessage != nullptr && m_lastMessage->m_messageId != -1) ) //&& (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount() )
 	{
 		// This should cause the popup to dissappear
 		TutorialPopupInfo popupInfo;
@@ -1763,7 +1764,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
 		ui.SetTutorialDescription( m_iPad, &popupInfo );
 	}
 
-	if(m_lastMessage != NULL) delete m_lastMessage;
+	if(m_lastMessage != nullptr) delete m_lastMessage;
 	m_lastMessage = message;
 
 	return true;
@@ -1777,7 +1778,7 @@ bool Tutorial::setMessage(TutorialHint *hint, PopupMessageDetails *message)
 
 	bool messageShown = false;
 	DWORD time = GetTickCount();
-	if(message != NULL && (message->m_forceDisplay || hintsOn) &&
+	if(message != nullptr && (message->m_forceDisplay || hintsOn) &&
 		(!message->m_delay ||
 		(
 		(m_hintDisplayed && (time - m_lastHintDisplayedTime) > m_iTutorialHintDelayTime ) ||
@@ -1792,7 +1793,7 @@ bool Tutorial::setMessage(TutorialHint *hint, PopupMessageDetails *message)
 		{
 			m_lastHintDisplayedTime = time;
 			m_hintDisplayed = true;
-			if(hint!=NULL) setHintCompleted( hint );
+			if(hint!=nullptr) setHintCompleted( hint );
 		}
 	}
 	return messageShown;
@@ -1815,7 +1816,7 @@ void Tutorial::showTutorialPopup(bool show)
 
 	if(!show)
 	{
-		if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
+		if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
 		{
 			uiTempDisabled = true;
 		}
@@ -1926,7 +1927,7 @@ void Tutorial::handleUIInput(int iAction)
 {
 	if( m_hintDisplayed ) return;
 
-	if(currentTask[m_CurrentState] != NULL)
+	if(currentTask[m_CurrentState] != nullptr)
 		currentTask[m_CurrentState]->handleUIInput(iAction);
 }
 
@@ -1988,7 +1989,7 @@ void Tutorial::onSelectedItemChanged(shared_ptr<ItemInstance> item)
 	// Menus and states like riding in a minecart will NOT allow this
 	if( isSelectedItemState() )
 	{
-		if(item != NULL)
+		if(item != nullptr)
 		{
 			switch(item->id)
 			{
@@ -2151,7 +2152,7 @@ void Tutorial::AddConstraint(TutorialConstraint *c)
 void Tutorial::RemoveConstraint(TutorialConstraint *c, bool delayedRemove /*= false*/)
 {
 	if( currentFailedConstraint[m_CurrentState] == c )
-		currentFailedConstraint[m_CurrentState] = NULL;
+		currentFailedConstraint[m_CurrentState] = nullptr;
 
 	if( c->getQueuedForRemoval() )
 	{
@@ -2211,16 +2212,16 @@ void Tutorial::addMessage(int messageId, bool limitRepeats /*= false*/, unsigned
 }
 
 #ifdef _XBOX
-void Tutorial::changeTutorialState(eTutorial_State newState, CXuiScene *scene /*= NULL*/)
+void Tutorial::changeTutorialState(eTutorial_State newState, CXuiScene *scene /*= nullptr*/)
 #else
-void Tutorial::changeTutorialState(eTutorial_State newState, UIScene *scene /*= NULL*/)
+void Tutorial::changeTutorialState(eTutorial_State newState, UIScene *scene /*= nullptr*/)
 #endif
 {
 	if(newState == m_CurrentState)
 	{
 		// If clearing the scene, make sure that the tutorial popup has its reference to this scene removed
 #ifndef _XBOX
-		if( scene == NULL )
+		if( scene == nullptr )
 		{
 			ui.RemoveInteractSceneReference(m_iPad, m_UIScene);
 		}
@@ -2241,7 +2242,7 @@ void Tutorial::changeTutorialState(eTutorial_State newState, UIScene *scene /*=
 		}
 
 		// The action that caused the change of state may also have completed the current task
-		if( currentTask[m_CurrentState] != NULL && currentTask[m_CurrentState]->isCompleted() )
+		if( currentTask[m_CurrentState] != nullptr && currentTask[m_CurrentState]->isCompleted() )
 		{
 			activeTasks[m_CurrentState].erase( find( activeTasks[m_CurrentState].begin(), activeTasks[m_CurrentState].end(), currentTask[m_CurrentState]) );
 
@@ -2252,21 +2253,21 @@ void Tutorial::changeTutorialState(eTutorial_State newState, UIScene *scene /*=
 			}
 			else
 			{
-				currentTask[m_CurrentState] = NULL;
+				currentTask[m_CurrentState] = nullptr;
 			}
 		}
 
-		if( currentTask[m_CurrentState] != NULL )
+		if( currentTask[m_CurrentState] != nullptr )
 		{
 			currentTask[m_CurrentState]->onStateChange(newState);
 		}
 
 		// Make sure that the current message is cleared
-		setMessage( NULL );
+		setMessage( nullptr );
 
 		// If clearing the scene, make sure that the tutorial popup has its reference to this scene removed
 #ifndef _XBOX
-		if( scene == NULL )
+		if( scene == nullptr )
 		{
 			ui.RemoveInteractSceneReference(m_iPad, m_UIScene);
 		}
diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.h b/Minecraft.Client/Common/Tutorial/Tutorial.h
index 169c33e3..c36a9086 100644
--- a/Minecraft.Client/Common/Tutorial/Tutorial.h
+++ b/Minecraft.Client/Common/Tutorial/Tutorial.h
@@ -139,9 +139,9 @@ public:
 	bool getCompleted( int completableId );
 
 #ifdef _XBOX
-	void changeTutorialState(eTutorial_State newState, CXuiScene *scene = NULL);
+	void changeTutorialState(eTutorial_State newState, CXuiScene *scene = nullptr);
 #else
-	void changeTutorialState(eTutorial_State newState, UIScene *scene = NULL);
+	void changeTutorialState(eTutorial_State newState, UIScene *scene = nullptr);
 #endif
 	bool isSelectedItemState();
 
diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
index 5f0808bf..d80d7d16 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
@@ -9,7 +9,7 @@
 
 TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) 
 	: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),
-	m_lastTile( NULL ), m_hintNeeded( true ), m_allowFade(allowFade)
+	m_lastTile( nullptr ), m_hintNeeded( true ), m_allowFade(allowFade)
 {
 	tutorial->addMessage(descriptionId, type != e_Hint_NoIngredients);
 }
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
index 82c81598..50a45a42 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
@@ -15,7 +15,7 @@ TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *con
 
 TutorialMode::~TutorialMode()
 {
-	if(tutorial != NULL)
+	if(tutorial != nullptr)
 		delete tutorial;
 }
 
@@ -38,7 +38,7 @@ bool TutorialMode::destroyBlock(int x, int y, int z, int face)
 	}
 	shared_ptr<ItemInstance> item = minecraft->player->getSelectedItem();
 	int damageBefore;
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		damageBefore = item->getDamageValue();
 	}
@@ -46,7 +46,7 @@ bool TutorialMode::destroyBlock(int x, int y, int z, int face)
 
 	if(!tutorial->m_allTutorialsComplete)
 	{
-		if ( item != NULL && item->isDamageableItem() )
+		if ( item != nullptr && item->isDamageableItem() )
 		{		
 			int max = item->getMaxDamage();
 			int damageNow = item->getDamageValue();
@@ -88,7 +88,7 @@ bool TutorialMode::useItemOn(shared_ptr<Player> player, Level *level, shared_ptr
 
 		if(!bTestUseOnly)
 		{	
-			if(item != NULL)
+			if(item != nullptr)
 			{
 				haveItem = true;
 				itemCount = item->count;
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Common/Tutorial/TutorialMode.h
index 75e24edf..2263a91c 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.h
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.h
@@ -19,7 +19,7 @@ public:
     virtual void startDestroyBlock(int x, int y, int z, int face);
     virtual bool destroyBlock(int x, int y, int z, int face);
     virtual void tick();
-    virtual bool useItemOn(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly=false, bool *pbUsedItem=NULL);
+    virtual bool useItemOn(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly=false, bool *pbUsedItem=nullptr);
     virtual void attack(shared_ptr<Player> player, shared_ptr<Entity> entity);
 
 	virtual bool isInputAllowed(int mapping);
diff --git a/Minecraft.Client/Common/Tutorial/TutorialTask.cpp b/Minecraft.Client/Common/Tutorial/TutorialTask.cpp
index 53fdd275..1b6d84b2 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialTask.cpp
@@ -9,7 +9,7 @@ TutorialTask::TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePre
 		areConstraintsEnabled( false ), bIsCompleted( false ), bHasBeenActivated( false ),
 		m_bAllowFade(bAllowFade), m_bTaskReminders(bTaskReminders), m_bShowMinimumTime( bShowMinimumTime), m_bShownForMinimumTime( false )
 {
-	if(inConstraints != NULL)
+	if(inConstraints != nullptr)
 	{
 		for(auto& constraint : *inConstraints)
 		{
diff --git a/Minecraft.Client/Common/Tutorial/UseItemTask.h b/Minecraft.Client/Common/Tutorial/UseItemTask.h
index 6c729540..9c8f0192 100644
--- a/Minecraft.Client/Common/Tutorial/UseItemTask.h
+++ b/Minecraft.Client/Common/Tutorial/UseItemTask.h
@@ -13,7 +13,7 @@ private:
 
 public:
 	UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
-		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
+		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
 	virtual bool isCompleted();
 	virtual void useItem(shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Tutorial/UseTileTask.h b/Minecraft.Client/Common/Tutorial/UseTileTask.h
index 74b3a40c..1f72fb2e 100644
--- a/Minecraft.Client/Common/Tutorial/UseTileTask.h
+++ b/Minecraft.Client/Common/Tutorial/UseTileTask.h
@@ -16,9 +16,9 @@ private:
 
 public:
 	UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
-		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
+		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
 	UseTileTask(const int tileId, Tutorial *tutorial, int descriptionId,
-		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true);
+		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true);
 	virtual bool isCompleted();
 	virtual void useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false);
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
index 71b88479..d0217d19 100644
--- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
@@ -22,13 +22,13 @@ bool XuiCraftingTask::isCompleted()
 	switch(m_type)
 	{
 	case e_Crafting_SelectGroup:
-		if(craftScene != NULL && craftScene->getCurrentGroup() == m_group)
+		if(craftScene != nullptr && craftScene->getCurrentGroup() == m_group)
 		{
 			completed = true;
 		}
 		break;
 	case e_Crafting_SelectItem:
-		if(craftScene != NULL && craftScene->isItemSelected(m_item))
+		if(craftScene != nullptr && craftScene->isItemSelected(m_item))
 		{
 			completed = true;
 		}
diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
index 2dc48709..146b1554 100644
--- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
+++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
@@ -12,7 +12,7 @@ public:
 	};
 
 	// Select group
-	XuiCraftingTask(Tutorial *tutorial, int descriptionId, Recipy::_eGroupType groupToSelect, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, 
+	XuiCraftingTask(Tutorial *tutorial, int descriptionId, Recipy::_eGroupType groupToSelect, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr, 
 		bool bShowMinimumTime=false,  bool bAllowFade=true, bool m_bTaskReminders=true )
 		: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints,	bShowMinimumTime, bAllowFade, m_bTaskReminders ),
 		m_group(groupToSelect),
@@ -20,7 +20,7 @@ public:
 	{}
 
 	// Select Item
-	XuiCraftingTask(Tutorial *tutorial, int descriptionId, int itemId, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, 
+	XuiCraftingTask(Tutorial *tutorial, int descriptionId, int itemId, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = nullptr, 
 		bool bShowMinimumTime=false,  bool bAllowFade=true, bool m_bTaskReminders=true )
 		: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints,	bShowMinimumTime, bAllowFade, m_bTaskReminders ),
 		m_item(itemId),
diff --git a/Minecraft.Client/Common/UI/IUIController.h b/Minecraft.Client/Common/UI/IUIController.h
index 3040c2cc..35a808c5 100644
--- a/Minecraft.Client/Common/UI/IUIController.h
+++ b/Minecraft.Client/Common/UI/IUIController.h
@@ -12,7 +12,7 @@ public:
 	virtual void StartReloadSkinThread() = 0;
 	virtual bool IsReloadingSkin() = 0;
 	virtual void CleanUpSkinReload() = 0;
-	virtual bool NavigateToScene(int iPad, EUIScene scene, void *initData = NULL, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD) = 0;
+	virtual bool NavigateToScene(int iPad, EUIScene scene, void *initData = nullptr, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD) = 0;
 	virtual bool NavigateBack(int iPad, bool forceUsePad = false, EUIScene eScene = eUIScene_COUNT, EUILayer eLayer = eUILayer_COUNT) = 0;
 	virtual void CloseUIScenes(int iPad, bool forceIPad = false) = 0;
 	virtual void CloseAllPlayersScenes() = 0;
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
index 88258421..7502d6bf 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
@@ -2,6 +2,7 @@
 
 #include "IUIScene_AbstractContainerMenu.h"
 
+#include "UI.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
@@ -21,9 +22,9 @@ SavedInventoryCursorPos g_savedInventoryCursorPos = { 0.0f, 0.0f, false };
 
 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu()
 {
-	m_menu = NULL;
+	m_menu = nullptr;
 	m_autoDeleteMenu = false;
-	m_lastPointerLabelSlot = NULL;
+	m_lastPointerLabelSlot = nullptr;
 
 	m_pointerPos.x = 0.0f;
 	m_pointerPos.y = 0.0f;
@@ -41,7 +42,7 @@ IUIScene_AbstractContainerMenu::~IUIScene_AbstractContainerMenu()
 
 void IUIScene_AbstractContainerMenu::Initialize(int iPad, AbstractContainerMenu* menu, bool autoDeleteMenu, int startIndex,ESceneSection firstSection,ESceneSection maxSection, bool bNavigateBack)
 {
-	assert( menu != NULL );
+	assert( menu != nullptr );
 
 	m_menu = menu;
 	m_autoDeleteMenu = autoDeleteMenu;
@@ -267,10 +268,10 @@ void IUIScene_AbstractContainerMenu::UpdateTooltips()
 void IUIScene_AbstractContainerMenu::onMouseTick()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[getPad()] != NULL)
+	if( pMinecraft->localgameModes[getPad()] != nullptr)
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(ACTION_MENU_UP))
 			{
@@ -296,8 +297,8 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	int iPad = getPad();
 
 	bool bStickInput = false;
-	float fInputX = InputManager.GetJoypadStick_LX( iPad, false )*((float)app.GetGameSettings(iPad,eGameSetting_Sensitivity_InMenu)/100.0f); // apply the sensitivity
-	float fInputY = InputManager.GetJoypadStick_LY( iPad, false )*((float)app.GetGameSettings(iPad,eGameSetting_Sensitivity_InMenu)/100.0f); // apply the sensitivity
+	float fInputX = InputManager.GetJoypadStick_LX( iPad, false )*(static_cast<float>(app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu))/100.0f); // apply the sensitivity
+	float fInputY = InputManager.GetJoypadStick_LY( iPad, false )*(static_cast<float>(app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu))/100.0f); // apply the sensitivity
 
 #ifdef __ORBIS__
 	// should have sensitivity for the touchpad
@@ -406,7 +407,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 		if ( m_iConsectiveInputTicks < MAX_INPUT_TICKS_FOR_SCALING )
 		{
 			++m_iConsectiveInputTicks;
-			fInputScale = ( (float)( m_iConsectiveInputTicks) / (float)(MAX_INPUT_TICKS_FOR_SCALING) );
+			fInputScale = ( static_cast<float>(m_iConsectiveInputTicks) / static_cast<float>((MAX_INPUT_TICKS_FOR_SCALING)) );
 		}
 #ifdef TAP_DETECTION
 		else if ( m_iConsectiveInputTicks < MAX_INPUT_TICKS_FOR_TAPPING )
@@ -481,25 +482,14 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 #endif
 
 #ifdef _WINDOWS64
-	if (!g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
+	if (iPad == 0 && !g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
 	{
 		int deltaX = g_KBMInput.GetMouseDeltaX();
 		int deltaY = g_KBMInput.GetMouseDeltaY();
-
-		extern HWND g_hWnd;
-		RECT rc;
-		GetClientRect(g_hWnd, &rc);
-		int winW = rc.right - rc.left;
-		int winH = rc.bottom - rc.top;
-
-		if (winW > 0 && winH > 0)
-		{
-			float scaleX = (float)getMovieWidth() / (float)winW;
-			float scaleY = (float)getMovieHeight() / (float)winH;
-
-			vPointerPos.x += (float)deltaX * scaleX;
-			vPointerPos.y += (float)deltaY * scaleY;
-		}
+		float scaleX, scaleY;
+		getMouseToSWFScale(scaleX, scaleY);
+		vPointerPos.x += static_cast<float>(deltaX) * scaleX;
+		vPointerPos.y += static_cast<float>(deltaY) * scaleY;
 
 		if (deltaX != 0 || deltaY != 0)
 		{
@@ -527,7 +517,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 		}
 		else if ( eSectionUnderPointer == eSectionNone )
 		{
-			ESceneSection eSection = ( ESceneSection )( iSection );
+			ESceneSection eSection = static_cast<ESceneSection>(iSection);
 
 			// Get position of this section.
 			UIVec2D sectionPos;
@@ -758,17 +748,17 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	// What are we carrying on pointer.
 	shared_ptr<LocalPlayer> player = Minecraft::GetInstance()->localplayers[getPad()];
 	shared_ptr<ItemInstance> carriedItem = nullptr;
-	if(player != NULL) carriedItem = player->inventory->getCarried();
+	if(player != nullptr) carriedItem = player->inventory->getCarried();
 
 	shared_ptr<ItemInstance> slotItem = nullptr;
-	Slot *slot = NULL;
+	Slot *slot = nullptr;
 	int slotIndex = 0;
 	if(bPointerIsOverSlot)
 	{
 		slotIndex = iNewSlotIndex + getSectionStartOffset( eSectionUnderPointer );
 		slot = m_menu->getSlot(slotIndex);
 	}
-	bool bIsItemCarried = carriedItem != NULL;
+	bool bIsItemCarried = carriedItem != nullptr;
 	int iCarriedCount = 0;
 	bool bCarriedIsSameAsSlot = false;	// Indicates if same item is carried on pointer as is in slot under pointer.
 	if ( bIsItemCarried )
@@ -788,7 +778,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	if ( bPointerIsOverSlot )
 	{
 		slotItem = slot->getItem();
-		bSlotHasItem = slotItem != NULL;
+		bSlotHasItem = slotItem != nullptr;
 		if ( bSlotHasItem )
 		{
 			iSlotCount = slotItem->GetCount();
@@ -829,13 +819,13 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	{
 		vector<HtmlString> *desc = GetSectionHoverText(eSectionUnderPointer);
 		SetPointerText(desc, false);
-		m_lastPointerLabelSlot = NULL;
+		m_lastPointerLabelSlot = nullptr;
 		delete desc;
 	}
 	else
 	{
-		SetPointerText(NULL, false);
-		m_lastPointerLabelSlot = NULL;
+		SetPointerText(nullptr, false);
+		m_lastPointerLabelSlot = nullptr;
 	}
 
 	EToolTipItem buttonA, buttonX, buttonY, buttonRT, buttonBack;
@@ -1021,7 +1011,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 				// Get the info on this item.
 				shared_ptr<ItemInstance> item = getSlotItem(eSectionUnderPointer, iNewSlotIndex);
 				bool bValidFuel = FurnaceTileEntity::isFuel(item);
-				bool bValidIngredient = FurnaceRecipes::getInstance()->getResult(item->getItem()->id) != NULL;
+				bool bValidIngredient = FurnaceRecipes::getInstance()->getResult(item->getItem()->id) != nullptr;
 
 				if(bValidIngredient)
 				{
@@ -1036,7 +1026,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 						}
 						else
 						{
-							if(FurnaceRecipes::getInstance()->getResult(item->id)==NULL)
+							if(FurnaceRecipes::getInstance()->getResult(item->id)==nullptr)
 							{
 								buttonY = eToolTipQuickMove;
 							}
@@ -1076,7 +1066,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 								}
 								else
 								{
-									if(FurnaceRecipes::getInstance()->getResult(item->id)==NULL)
+									if(FurnaceRecipes::getInstance()->getResult(item->id)==nullptr)
 									{
 										buttonY = eToolTipQuickMove;
 									}
@@ -1308,10 +1298,8 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 		}
 	}
 
-	vPointerPos.x = floor(vPointerPos.x);
-	vPointerPos.x += ( (int)vPointerPos.x%2);
-	vPointerPos.y = floor(vPointerPos.y);
-	vPointerPos.y += ( (int)vPointerPos.y%2);
+	vPointerPos.x = static_cast<float>(floor(vPointerPos.x + 0.5f));
+	vPointerPos.y = static_cast<float>(floor(vPointerPos.y + 0.5f));
 	m_pointerPos = vPointerPos;
 
 	adjustPointerForSafeZone();
@@ -1322,10 +1310,10 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 	bool bHandled = false;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[getPad()] != NULL )
+	if( pMinecraft->localgameModes[getPad()] != nullptr )
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			tutorial->handleUIInput(iAction);
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(iAction))
@@ -1379,8 +1367,8 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 					{
 						int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
 
-						bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
-						if (bSlotHasItem)
+						bool bcanPlaySound = !isSlotEmpty(m_eCurrSection, currentIndex);
+						if (bcanPlaySound)
 							ui.PlayUISFX(eSFX_Press);
 					}
 				}
@@ -1390,8 +1378,8 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 				{
 					int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
 
-					bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
-					if (bSlotHasItem)
+					bool bcanPlaySound = !isSlotEmpty(m_eCurrSection, currentIndex);
+					if (bcanPlaySound)
 						ui.PlayUISFX(eSFX_Press);
 				}
 				//
@@ -1486,12 +1474,26 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 		}
 		break;
 	case ACTION_MENU_UP:
+#ifdef _WINDOWS64
+		if (g_KBMInput.WasMouseWheelConsumed())
+		{
+			handleAdditionalKeyPress(ACTION_MENU_OTHER_STICK_UP);
+			break;
+		}
+#endif
 		{
 			//ui.PlayUISFX(eSFX_Focus);
 			m_eCurrTapState = eTapStateUp;
 		}
 		break;
 	case ACTION_MENU_DOWN:
+#ifdef _WINDOWS64
+		if (g_KBMInput.WasMouseWheelConsumed())
+		{
+			handleAdditionalKeyPress(ACTION_MENU_OTHER_STICK_DOWN);
+			break;
+		}
+#endif
 		{
 			//ui.PlayUISFX(eSFX_Focus);
 			m_eCurrTapState = eTapStateDown;
@@ -1513,20 +1515,20 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 				if ( bSlotHasItem )
 				{
 					shared_ptr<ItemInstance> item = getSlotItem(m_eCurrSection, currentIndex);
-					if( Minecraft::GetInstance()->localgameModes[iPad] != NULL )
+					if( Minecraft::GetInstance()->localgameModes[iPad] != nullptr )
 					{
 						Tutorial::PopupMessageDetails *message = new Tutorial::PopupMessageDetails;
 						message->m_messageId = item->getUseDescriptionId();
 
-						if(Item::items[item->id] != NULL) message->m_titleString = Item::items[item->id]->getHoverName(item);
+						if(Item::items[item->id] != nullptr) message->m_titleString = Item::items[item->id]->getHoverName(item);
 						message->m_titleId = item->getDescriptionId();
 
 						message->m_icon = item->id;
 						message->m_iAuxVal = item->getAuxValue();
 						message->m_forceDisplay = true;
 
-						TutorialMode *gameMode = (TutorialMode *)Minecraft::GetInstance()->localgameModes[iPad];
-						gameMode->getTutorial()->setMessage(NULL, message);
+						TutorialMode *gameMode = static_cast<TutorialMode *>(Minecraft::GetInstance()->localgameModes[iPad]);
+						gameMode->getTutorial()->setMessage(nullptr, message);
 						ui.PlayUISFX(eSFX_Press);
 					}
 				}
@@ -1628,7 +1630,7 @@ void IUIScene_AbstractContainerMenu::handleSlotListClicked(ESceneSection eSectio
 void IUIScene_AbstractContainerMenu::slotClicked(int slotId, int buttonNum, bool quickKey)
 {
 	// 4J Stu - Removed this line as unused
-	//if (slot != NULL) slotId = slot->index;
+	//if (slot != nullptr) slotId = slot->index;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	pMinecraft->localgameModes[getPad()]->handleInventoryMouseClick(m_menu->containerId, slotId, buttonNum, quickKey, pMinecraft->localplayers[getPad()] );
@@ -1645,7 +1647,7 @@ int IUIScene_AbstractContainerMenu::getCurrentIndex(ESceneSection eSection)
 
 bool IUIScene_AbstractContainerMenu::IsSameItemAs(shared_ptr<ItemInstance> itemA, shared_ptr<ItemInstance> itemB)
 {
-	if(itemA == NULL || itemB == NULL) return false;
+	if(itemA == nullptr || itemB == nullptr) return false;
 
 	return (itemA->id == itemB->id && (!itemB->isStackedByData() || itemB->getAuxValue() == itemA->getAuxValue()) && ItemInstance::tagMatches(itemB, itemA) );
 }
@@ -1654,7 +1656,7 @@ int IUIScene_AbstractContainerMenu::GetEmptyStackSpace(Slot *slot)
 {
 	int iResult = 0;
 
-	if(slot != NULL && slot->hasItem())
+	if(slot != nullptr && slot->hasItem())
 	{
 		shared_ptr<ItemInstance> item = slot->getItem();
 		if ( item->isStackable() )
@@ -1673,7 +1675,7 @@ int IUIScene_AbstractContainerMenu::GetEmptyStackSpace(Slot *slot)
 
 vector<HtmlString> *IUIScene_AbstractContainerMenu::GetItemDescription(Slot *slot)
 {
-	if(slot == NULL) return NULL;
+	if(slot == nullptr) return nullptr;
 
 	vector<HtmlString> *lines = slot->getItem()->getHoverText(nullptr, false);
 
@@ -1693,5 +1695,5 @@ vector<HtmlString> *IUIScene_AbstractContainerMenu::GetItemDescription(Slot *slo
 
 vector<HtmlString> *IUIScene_AbstractContainerMenu::GetSectionHoverText(ESceneSection eSection)
 {
-	return NULL;
+	return nullptr;
 }
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h
index 4877cfce..718a2d44 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h
@@ -277,4 +277,5 @@ public:
 	virtual int getPad() = 0;
 	virtual int getMovieWidth() = 0;
 	virtual int getMovieHeight() = 0;
+	virtual void getMouseToSWFScale(float &scaleX, float &scaleY) = 0;
 };
diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
index 10d1bcc4..1e6fa6fa 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
@@ -10,7 +10,7 @@
 IUIScene_AnvilMenu::IUIScene_AnvilMenu()
 {
 	m_inventory = nullptr;
-	m_repairMenu = NULL;
+	m_repairMenu = nullptr;
 	m_itemName = L"";
 }
 
@@ -231,7 +231,7 @@ void IUIScene_AnvilMenu::handleTick()
 void IUIScene_AnvilMenu::updateItemName()
 {
 	Slot *slot = m_repairMenu->getSlot(AnvilMenu::INPUT_SLOT);
-	if (slot != NULL && slot->hasItem())
+	if (slot != nullptr && slot->hasItem())
 	{
 		if (!slot->getItem()->hasCustomHoverName() && m_itemName.compare(slot->getItem()->getHoverName())==0)
 		{
@@ -245,7 +245,7 @@ void IUIScene_AnvilMenu::updateItemName()
 	ByteArrayOutputStream baos;
 	DataOutputStream dos(&baos);
 	dos.writeUTF(m_itemName);
-	Minecraft::GetInstance()->localplayers[getPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray())));
+	Minecraft::GetInstance()->localplayers[getPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray()));
 }
 
 void IUIScene_AnvilMenu::refreshContainer(AbstractContainerMenu *container, vector<shared_ptr<ItemInstance> > *items)
@@ -257,10 +257,10 @@ void IUIScene_AnvilMenu::slotChanged(AbstractContainerMenu *container, int slotI
 {
 	if (slotIndex == AnvilMenu::INPUT_SLOT)
 	{
-		m_itemName = item == NULL ? L"" : item->getHoverName();
+		m_itemName = item == nullptr ? L"" : item->getHoverName();
 		setEditNameValue(m_itemName);
-		setEditNameEditable(item != NULL);
-		if (item != NULL)
+		setEditNameEditable(item != nullptr);
+		if (item != nullptr)
 		{
 			updateItemName();
 		}
diff --git a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
index bb13deb8..3dede3d9 100644
--- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
@@ -216,13 +216,13 @@ void IUIScene_BeaconMenu::handleOtherClicked(int iPad, ESceneSection eSection, i
 	{
 	case eSectionBeaconConfirm:
 		{
-			if( (m_beacon->getItem(0) == NULL) || (m_beacon->getPrimaryPower() <= 0) ) return;
+			if( (m_beacon->getItem(0) == nullptr) || (m_beacon->getPrimaryPower() <= 0) ) return;
 			ByteArrayOutputStream baos;
 			DataOutputStream dos(&baos);
 			dos.writeInt(m_beacon->getPrimaryPower());
 			dos.writeInt(m_beacon->getSecondaryPower());
 
-			Minecraft::GetInstance()->localplayers[getPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_BEACON_PACKET, baos.toByteArray())));
+			Minecraft::GetInstance()->localplayers[getPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_BEACON_PACKET, baos.toByteArray()));
 
 			if (m_beacon->getPrimaryPower() > 0)
 			{
@@ -286,7 +286,7 @@ void IUIScene_BeaconMenu::handleTick()
 
 			for (int c = 0; c < count; c++)
 			{
-				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == NULL) continue;
+				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == nullptr) continue;
 
 				int effectId = BeaconTileEntity::BEACON_EFFECTS[tier][c]->id;
 				int icon = BeaconTileEntity::BEACON_EFFECTS[tier][c]->getIcon();
@@ -315,7 +315,7 @@ void IUIScene_BeaconMenu::handleTick()
 
 			for (int c = 0; c < count - 1; c++)
 			{
-				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == NULL) continue;
+				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == nullptr) continue;
 
 				int effectId = BeaconTileEntity::BEACON_EFFECTS[tier][c]->id;
 				int icon = BeaconTileEntity::BEACON_EFFECTS[tier][c]->getIcon();
@@ -355,7 +355,7 @@ void IUIScene_BeaconMenu::handleTick()
 		}
 	}
 
-	SetConfirmButtonEnabled( (m_beacon->getItem(0) != NULL) && (m_beacon->getPrimaryPower() > 0) );
+	SetConfirmButtonEnabled( (m_beacon->getItem(0) != nullptr) && (m_beacon->getPrimaryPower() > 0) );
 }
 
 int IUIScene_BeaconMenu::GetId(int tier, int effectId)
@@ -365,7 +365,7 @@ int IUIScene_BeaconMenu::GetId(int tier, int effectId)
 
 vector<HtmlString> *IUIScene_BeaconMenu::GetSectionHoverText(ESceneSection eSection)
 {
-	vector<HtmlString> *desc = NULL;
+	vector<HtmlString> *desc = nullptr;
 	switch(eSection)
 	{
 	case eSectionBeaconSecondaryTwo:
diff --git a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
index 4371b4e5..3af01678 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
@@ -20,6 +20,6 @@ void IUIScene_CommandBlockMenu::ConfirmButtonClicked()
 	dos.writeInt(m_commandBlock->z);
 	dos.writeUTF(GetCommand());
 
-	Minecraft::GetInstance()->localplayers[GetPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET, baos.toByteArray())));
+	Minecraft::GetInstance()->localplayers[GetPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET, baos.toByteArray()));
 }
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
index fc012be3..6fddece9 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
@@ -6,6 +6,8 @@
 #include "..\..\LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 
+#include "UI.h"
+
 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA[IUIScene_CraftingMenu::m_iMaxGroup2x2]=
 {
 	Recipy::eGroupType_Structure,
@@ -154,10 +156,10 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[getPad()] != NULL )
+	if( pMinecraft->localgameModes[getPad()] != nullptr )
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			tutorial->handleUIInput(iAction);
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(iAction))
@@ -211,10 +213,10 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 					shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[iRecipe].pRecipy->assemble(nullptr);
 					//int iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue());
 
-					if( pMinecraft->localgameModes[iPad] != NULL)
+					if( pMinecraft->localgameModes[iPad] != nullptr)
 					{
 						Tutorial *tutorial = pMinecraft->localgameModes[iPad]->getTutorial();
-						if(tutorial != NULL)
+						if(tutorial != nullptr)
 						{
 							tutorial->onCrafted(pTempItemInst);
 						}
@@ -247,10 +249,10 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 				shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[iRecipe].pRecipy->assemble(nullptr);
 				//int iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue());
 
-				if( pMinecraft->localgameModes[iPad] != NULL )
+				if( pMinecraft->localgameModes[iPad] != nullptr )
 				{
 					Tutorial *tutorial = pMinecraft->localgameModes[iPad]->getTutorial();
-					if(tutorial != NULL)
+					if(tutorial != nullptr)
 					{
 						tutorial->createItemSelected(pTempItemInst, pRecipeIngredientsRequired[iRecipe].bCanMake[iPad]);
 					}
@@ -288,12 +290,12 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 								}
 
 								// 4J Stu - Fix for #13097 - Bug: Milk Buckets are removed when crafting Cake
-								if (ingItemInst != NULL)
+								if (ingItemInst != nullptr)
 								{
 									if (ingItemInst->getItem()->hasCraftingRemainingItem())
 									{
 										// replace item with remaining result
-										m_pPlayer->inventory->add( shared_ptr<ItemInstance>( new ItemInstance(ingItemInst->getItem()->getCraftingRemainingItem()) ) );
+										m_pPlayer->inventory->add(std::make_shared<ItemInstance>(ingItemInst->getItem()->getCraftingRemainingItem()));
 									}
 
 								}
@@ -608,7 +610,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 		// dump out the inventory
 		/*		for (unsigned int k = 0; k < m_pPlayer->inventory->items.length; k++)
 		{
-		if (m_pPlayer->inventory->items[k] != NULL)
+		if (m_pPlayer->inventory->items[k] != nullptr)
 		{
 		wstring itemstring=m_pPlayer->inventory->items[k]->toString();
 
@@ -620,15 +622,15 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 		*/
 		RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies();
 		Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray();
-		int iRecipeC=(int)recipes->size();
+		int iRecipeC=static_cast<int>(recipes->size());
         auto itRecipe = recipes->begin();
 
         // dump out the recipe products
 
 		// 		for (int i = 0; i < iRecipeC; i++)
 		// 		{
-		// 			shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[i].pRecipy->assemble(NULL);
-		// 			if (pTempItemInst != NULL)
+		// 			shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[i].pRecipy->assemble(nullptr);
+		// 			if (pTempItemInst != nullptr)
 		// 			{
 		// 				wstring itemstring=pTempItemInst->toString();
 		//
@@ -683,7 +685,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 				// Does the player have this ingredient?
 				for (unsigned int k = 0; k < m_pPlayer->inventory->items.length; k++)
 				{
-					if (m_pPlayer->inventory->items[k] != NULL)
+					if (m_pPlayer->inventory->items[k] != nullptr)
 					{
 						// do they have the ingredient, and the aux value matches, and enough off it?
 						if((m_pPlayer->inventory->items[k]->id == pRecipeIngredientsRequired[i].iIngIDA[j]) &&
@@ -703,7 +705,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 
 								for(unsigned int l=0;l<m_pPlayer->inventory->items.length;l++)
 								{
-									if (m_pPlayer->inventory->items[l] != NULL)
+									if (m_pPlayer->inventory->items[l] != nullptr)
 									{
 										if(
 											(m_pPlayer->inventory->items[l]->id == pRecipeIngredientsRequired[i].iIngIDA[j]) &&
@@ -1071,7 +1073,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
 			int iAuxVal=pRecipeIngredientsRequired[iRecipe].iIngAuxValA[i];
 			Item *item = Item::items[id];
 
-			shared_ptr<ItemInstance> itemInst= shared_ptr<ItemInstance>(new ItemInstance(item,pRecipeIngredientsRequired[iRecipe].iIngValA[i],iAuxVal));
+			shared_ptr<ItemInstance> itemInst= std::make_shared<ItemInstance>(item, pRecipeIngredientsRequired[iRecipe].iIngValA[i], iAuxVal);
 
 			// 4J-PB - a very special case - the bed can use any kind of wool, so we can't use the item description
 			// and the same goes for the painting
@@ -1156,7 +1158,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
 					{
 						iAuxVal = 1;
 					}
-					shared_ptr<ItemInstance> itemInst= shared_ptr<ItemInstance>(new ItemInstance(id,1,iAuxVal));
+					shared_ptr<ItemInstance> itemInst= std::make_shared<ItemInstance>(id, 1, iAuxVal);
 					setIngredientSlotItem(getPad(),index,itemInst);
 					// show the ingredients we don't have if we can't make the recipe
 					if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_CraftAnything))
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index 0d3f7dac..a0c0ebdd 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "IUIScene_CreativeMenu.h"
 
+#include "UI.h"
 #include "..\..\Minecraft.h"
 #include "..\..\MultiplayerLocalPlayer.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
@@ -13,7 +14,7 @@
 #include "..\..\..\Minecraft.World\JavaMath.h"
 
 // 4J JEV - Images for each tab.
-IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = NULL;
+IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = nullptr;
 
 vector< shared_ptr<ItemInstance> > IUIScene_CreativeMenu::categoryGroups[eCreativeInventoryGroupsCount];
 
@@ -21,7 +22,6 @@ vector< shared_ptr<ItemInstance> > IUIScene_CreativeMenu::categoryGroups[eCreati
 #define ITEM_AUX(id, aux) list->push_back( shared_ptr<ItemInstance>(new ItemInstance(id, 1, aux)) );
 #define DEF(index) list = &categoryGroups[index];
 
-
 void IUIScene_CreativeMenu::staticCtor()
 {
 	vector< shared_ptr<ItemInstance> > *list;
@@ -488,14 +488,14 @@ void IUIScene_CreativeMenu::staticCtor()
 		for(unsigned int i = 0; i < Enchantment::enchantments.length; ++i)
 		{
 			Enchantment *enchantment = Enchantment::enchantments[i];
-			if (enchantment == NULL || enchantment->category == NULL) continue;
+			if (enchantment == nullptr || enchantment->category == nullptr) continue;
 			list->push_back(Item::enchantedBook->createForEnchantment(new EnchantmentInstance(enchantment, enchantment->getMaxLevel())));
 		}
 
 #ifndef _CONTENT_PACKAGE
 		if(app.DebugSettingsOn())
 		{
-			shared_ptr<ItemInstance> debugSword = shared_ptr<ItemInstance>(new ItemInstance(Item::sword_diamond_Id, 1, 0));
+			shared_ptr<ItemInstance> debugSword = std::make_shared<ItemInstance>(Item::sword_diamond_Id, 1, 0);
 			debugSword->enchant( Enchantment::damageBonus, 50 );
 			debugSword->setHoverName(L"Sword of Debug");
 			list->push_back(debugSword);
@@ -673,7 +673,7 @@ void IUIScene_CreativeMenu::staticCtor()
 #ifndef _CONTENT_PACKAGE
 	ECreative_Inventory_Groups decorationsGroup[] = {eCreativeInventory_Decoration};
 	ECreative_Inventory_Groups debugDecorationsGroup[] = {eCreativeInventory_ArtToolsDecorations};
-	specs[eCreativeInventoryTab_Decorations] = new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup, 0, NULL, 1, debugDecorationsGroup);
+	specs[eCreativeInventoryTab_Decorations] = new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup, 0, nullptr, 1, debugDecorationsGroup);
 #else
 	ECreative_Inventory_Groups decorationsGroup[] = {eCreativeInventory_Decoration};
 	specs[eCreativeInventoryTab_Decorations] = new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup);
@@ -707,7 +707,7 @@ void IUIScene_CreativeMenu::staticCtor()
 #ifndef _CONTENT_PACKAGE
 	ECreative_Inventory_Groups miscGroup[] = {eCreativeInventory_Misc};
 	ECreative_Inventory_Groups debugMiscGroup[] = {eCreativeInventory_ArtToolsMisc};
-	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup, 0, NULL, 1, debugMiscGroup);
+	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup, 0, nullptr, 1, debugMiscGroup);
 #else
 	ECreative_Inventory_Groups miscGroup[] = {eCreativeInventory_Misc};
 	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup);
@@ -766,12 +766,12 @@ void IUIScene_CreativeMenu::ScrollBar(UIVec2D pointerPos)
 
 // 4J JEV - Tab Spec Struct
 
-IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups *dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups *debugGroups /*= NULL*/)
+IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups *dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups *debugGroups /*= nullptr*/)
 	: m_icon(icon), m_descriptionId(descriptionId), m_staticGroupsCount(staticGroupsCount), m_dynamicGroupsCount(dynamicGroupsCount), m_debugGroupsCount(debugGroupsCount)
 {
 
 	m_pages = 0;
-	m_staticGroupsA = NULL;
+	m_staticGroupsA = nullptr;
 
 	unsigned int dynamicItems = 0;
 	m_staticItems = 0;
@@ -786,7 +786,7 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
 		}
 	}
 
-	m_debugGroupsA = NULL;
+	m_debugGroupsA = nullptr;
 	m_debugItems = 0;
 	if(debugGroupsCount > 0)
 	{
@@ -798,8 +798,8 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
 		}
 	}
 
-	m_dynamicGroupsA = NULL;
-	if(dynamicGroupsCount > 0 && dynamicGroups != NULL)
+	m_dynamicGroupsA = nullptr;
+	if(dynamicGroupsCount > 0 && dynamicGroups != nullptr)
 	{
 		m_dynamicGroupsA  = new ECreative_Inventory_Groups[dynamicGroupsCount];
 		for(int i = 0; i < dynamicGroupsCount; ++i)
@@ -816,9 +816,9 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
 
 IUIScene_CreativeMenu::TabSpec::~TabSpec()
 {
-	if(m_staticGroupsA != NULL) delete [] m_staticGroupsA;
-	if(m_dynamicGroupsA != NULL) delete [] m_dynamicGroupsA;
-	if(m_debugGroupsA != NULL) delete [] m_debugGroupsA;
+	if(m_staticGroupsA != nullptr) delete [] m_staticGroupsA;
+	if(m_dynamicGroupsA != nullptr) delete [] m_dynamicGroupsA;
+	if(m_debugGroupsA != nullptr) delete [] m_debugGroupsA;
 }
 
 void IUIScene_CreativeMenu::TabSpec::populateMenu(AbstractContainerMenu *menu, int dynamicIndex, unsigned int page)
@@ -826,7 +826,7 @@ void IUIScene_CreativeMenu::TabSpec::populateMenu(AbstractContainerMenu *menu, i
 	int lastSlotIndex = 0;
 
 	// Fill the dynamic group
-	if(m_dynamicGroupsCount > 0 && m_dynamicGroupsA != NULL)
+	if(m_dynamicGroupsCount > 0 && m_dynamicGroupsA != nullptr)
 	{
         for (auto it = categoryGroups[m_dynamicGroupsA[dynamicIndex]].rbegin(); it != categoryGroups[m_dynamicGroupsA[dynamicIndex]].rend() && lastSlotIndex < MAX_SIZE; ++it)
         {
@@ -957,7 +957,7 @@ IUIScene_CreativeMenu::ItemPickerMenu::ItemPickerMenu(	shared_ptr<SimpleContaine
 
 	//int startLength = slots->size();
 
-	Slot *slot = NULL;
+	Slot *slot = nullptr;
 	for (int i = 0; i < TabSpec::MAX_SIZE; i++)
 	{
 		// 4J JEV -  These values get set by addSlot anyway.
@@ -1036,11 +1036,11 @@ bool IUIScene_CreativeMenu::handleValidKeyPress(int iPad, int buttonNum, BOOL qu
 		{
 			shared_ptr<ItemInstance> newItem = m_menu->getSlot(i)->getItem();
 
-			if(newItem != NULL)
+			if(newItem != nullptr)
 			{
 				m_menu->getSlot(i)->set(nullptr);
 				// call this function to synchronize multiplayer item bar
-				pMinecraft->localgameModes[iPad]->handleCreativeModeItemAdd(nullptr, i - (int)m_menu->slots.size() + 9 + InventoryMenu::USE_ROW_SLOT_START);
+				pMinecraft->localgameModes[iPad]->handleCreativeModeItemAdd(nullptr, i - static_cast<int>(m_menu->slots.size()) + 9 + InventoryMenu::USE_ROW_SLOT_START);
 			}
 		}
 		return true;
@@ -1054,7 +1054,7 @@ void IUIScene_CreativeMenu::handleOutsideClicked(int iPad, int buttonNum, BOOL q
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	shared_ptr<Inventory> playerInventory = pMinecraft->localplayers[iPad]->inventory;
-	if (playerInventory->getCarried() != NULL)
+	if (playerInventory->getCarried() != nullptr)
 	{
 		if (buttonNum == 0)
 		{
@@ -1082,8 +1082,8 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
 		// Fall through intentional
 	case ACTION_MENU_RIGHT_SCROLL:
 		{
-			ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + dir);
-			if (tab < 0) tab = (ECreativeInventoryTabs)(eCreativeInventoryTab_COUNT - 1);
+			ECreativeInventoryTabs tab = static_cast<ECreativeInventoryTabs>(m_curTab + dir);
+			if (tab < 0) tab = static_cast<ECreativeInventoryTabs>(eCreativeInventoryTab_COUNT - 1);
 			if (tab >= eCreativeInventoryTab_COUNT) tab = eCreativeInventoryTab_BuildingBlocks;
 			switchTab(tab);
 			ui.PlayUISFX(eSFX_Focus);
@@ -1099,13 +1099,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
 		break;
 	case ACTION_MENU_OTHER_STICK_DOWN:
 		{
-			int pageStep = TabSpec::rows;
-#ifdef _WINDOWS64
-			if (g_KBMInput.WasMouseWheelConsumed())
-			{
-				pageStep = 1;
-			}
-#endif
+			int pageStep = 1;
 			m_tabPage[m_curTab] += pageStep;
 			if(m_tabPage[m_curTab] >= specs[m_curTab]->getPageCount())
 			{
@@ -1119,13 +1113,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
 		break;
 	case ACTION_MENU_OTHER_STICK_UP:
 		{
-			int pageStep = TabSpec::rows;
-#ifdef _WINDOWS64
-			if (g_KBMInput.WasMouseWheelConsumed())
-			{
-				pageStep = 1;
-			}
-#endif
+			int pageStep = 1;
 			m_tabPage[m_curTab] -= pageStep;
 			if(m_tabPage[m_curTab] < 0)
 			{
@@ -1155,7 +1143,7 @@ void IUIScene_CreativeMenu::handleSlotListClicked(ESceneSection eSection, int bu
 			shared_ptr<Inventory> playerInventory = pMinecraft->localplayers[getPad()]->inventory;
 			shared_ptr<ItemInstance> carried = playerInventory->getCarried();
 			shared_ptr<ItemInstance> clicked = m_menu->getSlot(currentIndex)->getItem();
-			if (clicked != NULL)
+			if (clicked != nullptr)
 			{
 				playerInventory->setCarried(ItemInstance::clone(clicked));
 				carried = playerInventory->getCarried();
@@ -1188,7 +1176,7 @@ void IUIScene_CreativeMenu::handleSlotListClicked(ESceneSection eSection, int bu
 		m_menu->clicked(currentIndex, buttonNum, quickKeyHeld?AbstractContainerMenu::CLICK_QUICK_MOVE:AbstractContainerMenu::CLICK_PICKUP, pMinecraft->localplayers[getPad()]);
 		shared_ptr<ItemInstance> newItem = m_menu->getSlot(currentIndex)->getItem();
 		// call this function to synchronize multiplayer item bar
-		pMinecraft->localgameModes[getPad()]->handleCreativeModeItemAdd(newItem, currentIndex - (int)m_menu->slots.size() + 9 + InventoryMenu::USE_ROW_SLOT_START);
+		pMinecraft->localgameModes[getPad()]->handleCreativeModeItemAdd(newItem, currentIndex - static_cast<int>(m_menu->slots.size()) + 9 + InventoryMenu::USE_ROW_SLOT_START);
 
 		if(m_bCarryingCreativeItem)
 		{
@@ -1236,7 +1224,7 @@ bool IUIScene_CreativeMenu::getEmptyInventorySlot(shared_ptr<ItemInstance> item,
 	for(unsigned int i = TabSpec::MAX_SIZE; i < TabSpec::MAX_SIZE + 9; ++i)
 	{
 		shared_ptr<ItemInstance> slotItem = m_menu->getSlot(i)->getItem();
-		if( slotItem != NULL && slotItem->sameItemWithTags(item) && (slotItem->GetCount() + item->GetCount() <= item->getMaxStackSize() ))
+		if( slotItem != nullptr && slotItem->sameItemWithTags(item) && (slotItem->GetCount() + item->GetCount() <= item->getMaxStackSize() ))
 		{
 			sameItemFound = true;
 			slotX = i - TabSpec::MAX_SIZE;
@@ -1249,7 +1237,7 @@ bool IUIScene_CreativeMenu::getEmptyInventorySlot(shared_ptr<ItemInstance> item,
 		// Find an empty slot
 		for(unsigned int i = TabSpec::MAX_SIZE; i < TabSpec::MAX_SIZE + 9; ++i)
 		{
-			if( m_menu->getSlot(i)->getItem() == NULL )
+			if( m_menu->getSlot(i)->getItem() == nullptr )
 			{
 				slotX = i - TabSpec::MAX_SIZE;
 				emptySlotFound = true;
@@ -1328,7 +1316,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 	// diamonds give trails
 	if (trail) expTag->putBoolean(FireworksItem::TAG_E_TRAIL, true);
 
-	intArray colorArray(colors.size());
+	intArray colorArray(static_cast<unsigned int>(colors.size()));
 	for (int i = 0; i < colorArray.length; i++)
 	{
 		colorArray[i] = colors.at(i);
@@ -1347,7 +1335,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 		vector<int> colors;
 		colors.push_back(DyePowderItem::COLOR_RGB[fadeColor]);
 
-		intArray colorArray(colors.size());
+		intArray colorArray(static_cast<unsigned int>(colors.size()));
 		for (int i = 0; i < colorArray.length; i++)
 		{
 			colorArray[i] = colors.at(i);
@@ -1362,7 +1350,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 	shared_ptr<ItemInstance> firework;
 
 	{
-		firework = shared_ptr<ItemInstance>( new ItemInstance(Item::fireworks) );
+		firework = std::make_shared<ItemInstance>(Item::fireworks);
 		CompoundTag *itemTag = new CompoundTag();
 		CompoundTag *fireTag = new CompoundTag(FireworksItem::TAG_FIREWORKS);
 		ListTag<CompoundTag> *expTags = new ListTag<CompoundTag>(FireworksItem::TAG_EXPLOSIONS);
@@ -1370,7 +1358,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 		expTags->add(expTag);
 
 		fireTag->put(FireworksItem::TAG_EXPLOSIONS, expTags);
-		fireTag->putByte(FireworksItem::TAG_FLIGHT, (byte) sulphur);
+		fireTag->putByte(FireworksItem::TAG_FLIGHT, static_cast<byte>(sulphur));
 
 		itemTag->put(FireworksItem::TAG_FIREWORKS, fireTag);
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
index 64b78029..864fb560 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
@@ -69,7 +69,7 @@ public:
 		unsigned int m_debugItems;
 
 	public:
-		TabSpec( LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount = 0, ECreative_Inventory_Groups *dynamicGroups = NULL, int debugGroupsCount = 0, ECreative_Inventory_Groups *debugGroups = NULL );
+		TabSpec( LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount = 0, ECreative_Inventory_Groups *dynamicGroups = nullptr, int debugGroupsCount = 0, ECreative_Inventory_Groups *debugGroups = nullptr );
 		~TabSpec();
 
 		void populateMenu(AbstractContainerMenu *menu, int dynamicIndex, unsigned int page);
diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
index c73f7dc5..fbbf7c24 100644
--- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
@@ -181,5 +181,5 @@ bool IUIScene_EnchantingMenu::IsSectionSlotList( ESceneSection eSection )
 
 EnchantmentMenu *IUIScene_EnchantingMenu::getMenu()
 {
-	return (EnchantmentMenu *)m_menu;
+	return static_cast<EnchantmentMenu *>(m_menu);
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
index 03adbd2c..d2754789 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
@@ -7,6 +7,8 @@
 #include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "IUIScene_HUD.h"
 
+#include "UI.h"
+
 IUIScene_HUD::IUIScene_HUD()
 {
 	m_lastActiveSlot = -1;
@@ -79,7 +81,7 @@ void IUIScene_HUD::updateFrameTick()
 	{
 		//SetRidingHorse(false, 0);
 		shared_ptr<Entity> riding = pMinecraft->localplayers[iPad]->riding;
-		if(riding == NULL)
+		if(riding == nullptr)
 		{
 			SetRidingHorse(false, false, 0);
 		}
@@ -146,8 +148,8 @@ void IUIScene_HUD::updateFrameTick()
 		{
 			if(uiOpacityTimer<10)
 			{
-				float fStep=(80.0f-(float)ucAlpha)/10.0f;
-				fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+				float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+				fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 			}
 			else
 			{
@@ -156,7 +158,7 @@ void IUIScene_HUD::updateFrameTick()
 		}
 		else
 		{
-			fVal=0.01f*(float)ucAlpha;
+			fVal=0.01f*static_cast<float>(ucAlpha);
 		}
 	}
 	else
@@ -166,12 +168,12 @@ void IUIScene_HUD::updateFrameTick()
 		{
 			ucAlpha=15;
 		}
-		fVal=0.01f*(float)ucAlpha;
+		fVal=0.01f*static_cast<float>(ucAlpha);
 	}
 	SetOpacity(fVal);
 
 	bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(iPad) && !(app.GetXuiAction(iPad)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(iPad,eGameSetting_DisplayHUD)!=0;
-	if(bDisplayGui && pMinecraft->localplayers[iPad] != NULL)
+	if(bDisplayGui && pMinecraft->localplayers[iPad] != nullptr)
 	{
 		SetVisible(true);			
 	}
@@ -193,12 +195,12 @@ void IUIScene_HUD::renderPlayerHealth()
 	// Update health
 	bool blink = pMinecraft->localplayers[iPad]->invulnerableTime / 3 % 2 == 1;
 	if (pMinecraft->localplayers[iPad]->invulnerableTime < 10) blink = false;
-	int currentHealth = pMinecraft->localplayers[iPad]->getHealth();
-	int oldHealth = pMinecraft->localplayers[iPad]->lastHealth;
+	int currentHealth = static_cast<int>(ceil(pMinecraft->localplayers[iPad]->getHealth()));
+    int oldHealth = static_cast<int>(ceil(pMinecraft->localplayers[iPad]->lastHealth));
 	bool bHasPoison = pMinecraft->localplayers[iPad]->hasEffect(MobEffect::poison);
 	bool bHasWither = pMinecraft->localplayers[iPad]->hasEffect(MobEffect::wither);
 	AttributeInstance *maxHealthAttribute = pMinecraft->localplayers[iPad]->getAttribute(SharedMonsterAttributes::MAX_HEALTH);
-	float maxHealth = (float)maxHealthAttribute->getValue();
+	float maxHealth = static_cast<float>(maxHealthAttribute->getValue());
 	float totalAbsorption = pMinecraft->localplayers[iPad]->getAbsorptionAmount();
 
 	// Update armour
@@ -219,7 +221,7 @@ void IUIScene_HUD::renderPlayerHealth()
 
 	shared_ptr<Entity> riding = pMinecraft->localplayers[iPad]->riding;
 
-	if(riding == NULL || riding && !riding->instanceof(eTYPE_LIVINGENTITY))
+	if(riding == nullptr || riding && !riding->instanceof(eTYPE_LIVINGENTITY))
 	{
 		SetRidingHorse(false, false, 0);
 
@@ -242,8 +244,8 @@ void IUIScene_HUD::renderPlayerHealth()
 		if (pMinecraft->localplayers[iPad]->isUnderLiquid(Material::water))
 		{
 			ShowAir(true);
-			int count = (int) ceil((pMinecraft->localplayers[iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY);
-			int extra = (int) ceil((pMinecraft->localplayers[iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY) - count;
+			int count = static_cast<int>(ceil((pMinecraft->localplayers[iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY));
+			int extra = static_cast<int>(ceil((pMinecraft->localplayers[iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY)) - count;
 			SetAir(count, extra);
 		}
 		else
@@ -254,7 +256,7 @@ void IUIScene_HUD::renderPlayerHealth()
 	else if(riding->instanceof(eTYPE_LIVINGENTITY) )
 	{
 		shared_ptr<LivingEntity> living = dynamic_pointer_cast<LivingEntity>(riding);
-		int riderCurrentHealth = (int) ceil(living->getHealth());
+		int riderCurrentHealth = static_cast<int>(ceil(living->getHealth()));
 		float maxRiderHealth = living->getMaxHealth();
 
 		SetRidingHorse(true, pMinecraft->localplayers[iPad]->isRidingJumpable(), maxRiderHealth);
diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
index ab1767d4..e88ed08c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
@@ -52,7 +52,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStor
 			if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 			{
 				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+				DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 
 				DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 				if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
@@ -229,7 +229,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 		{
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -248,7 +248,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
 				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chSkuID[SCE_NP_COMMERCE2_SKU_ID_LEN];
@@ -300,7 +300,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 
 				DLC_INFO *pDLCInfo=app.GetDLCInfoForProductName((WCHAR *)pDLCPack->getName().c_str());
 
-				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),nullptr,nullptr);
 
 				// the license change coming in when the offer has been installed will cause this scene to refresh	
 			}
@@ -336,7 +336,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 			// need to allow downloads here, or the player would need to quit the game to let the download of a texture pack happen. This might affect the network traffic, since the download could take all the bandwidth...
 			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 		}
 	}
 	else
@@ -352,7 +352,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 
 int IUIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 {
-	bool bAutosave=(bool)lpParameter;
+	bool bAutosave=static_cast<bool>(lpParameter);
 	if(bAutosave)
 	{
 		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
@@ -421,7 +421,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	bool saveStats = true;
 	if (pMinecraft->isClientSide() || g_NetworkManager.IsInSession())
 	{
-		if(lpParameter != NULL )
+		if(lpParameter != nullptr )
 		{
 			// 4J-PB - check if we have lost connection to Live
 			if(ProfileManager.GetLiveConnectionStatus()!=XONLINE_S_LOGON_CONNECTION_ESTABLISHED )
@@ -522,17 +522,17 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 			exitReasonStringId = -1;
 
 			// 4J - Force a disconnection, this handles the situation that the server has already disconnected
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect(false);
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect(false);
-			if( pMinecraft->levels[2] != NULL ) pMinecraft->levels[2]->disconnect(false);
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect(false);
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect(false);
+			if( pMinecraft->levels[2] != nullptr ) pMinecraft->levels[2]->disconnect(false);
 		}
 		else
 		{
 			exitReasonStringId = IDS_EXITING_GAME;
 			pMinecraft->progressRenderer->progressStartNoAbort( IDS_EXITING_GAME );
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect();
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect();
-			if( pMinecraft->levels[2] != NULL ) pMinecraft->levels[2]->disconnect();
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect();
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect();
+			if( pMinecraft->levels[2] != nullptr ) pMinecraft->levels[2]->disconnect();
 		}
 
 		// 4J Stu - This only does something if we actually have a server, so don't need to do any other checks
@@ -548,7 +548,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	}
 	else
 	{
-		if(lpParameter != NULL && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()) )
+		if(lpParameter != nullptr && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()) )
 		{
 			switch( app.GetDisconnectReason() )
 			{
@@ -625,7 +625,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	{
 		Sleep(1);
 	}
-	pMinecraft->setLevel(NULL,exitReasonStringId,nullptr,saveStats);
+	pMinecraft->setLevel(nullptr,exitReasonStringId,nullptr,saveStats);
 
 	TelemetryManager->Flush();
 	
diff --git a/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp b/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
index d3a9e8f0..735da438 100644
--- a/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
@@ -45,7 +45,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 
 	// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 	// REMOVE UNTIL WORKING
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 
 	// first pass - look to see if there are any that are not in the list
 	bool bTexturePackAlreadyListed;
@@ -86,7 +86,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 		// add a TMS request for them
 		app.DebugPrintf("+++ Adding TMSPP request for texture pack data\n");
 		app.AddTMSPPFileTypeRequest(e_DLC_TexturePackData);
-		if(m_iConfigA!=NULL)
+		if(m_iConfigA!=nullptr)
 		{
 			delete m_iConfigA;
 		}
@@ -123,7 +123,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 
 void IUIScene_StartGame::handleSelectionChanged(F64 selectedId)
 {
-	m_iSetTexturePackDescription = (int)selectedId;
+	m_iSetTexturePackDescription = static_cast<int>(selectedId);
 
 	if(!m_texturePackDescDisplayed)
 	{	
@@ -135,13 +135,13 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index)
 {
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackByIndex(index);
 
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 #if TO_BE_IMPLEMENTED		
 		// this is probably a texture pack icon added from TMS
 
 		DWORD dwBytes=0,dwFileBytes=0;
-		PBYTE pbData=NULL,pbFileData=NULL;
+		PBYTE pbData=nullptr,pbFileData=nullptr;
 
 		CXuiCtrl4JList::LIST_ITEM_INFO ListItem;
 		// get the current index of the list, and then get the data
@@ -171,7 +171,7 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackComparison->UseBrush(NULL);
+			m_texturePackComparison->UseBrush(nullptr);
 		}
 #endif
 	}
@@ -214,7 +214,7 @@ void IUIScene_StartGame::UpdateCurrentTexturePack(int iSlot)
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackByIndex(m_currentTexturePackIndex);
 
 	// if the texture pack is null, you don't have it yet
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 #if TO_BE_IMPLEMENTED
 		// Upsell
@@ -254,7 +254,7 @@ void IUIScene_StartGame::UpdateCurrentTexturePack(int iSlot)
 
 int IUIScene_StartGame::TrialTexturePackWarningReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	IUIScene_StartGame* pScene = (IUIScene_StartGame*)pParam;
+	IUIScene_StartGame* pScene = static_cast<IUIScene_StartGame *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -269,7 +269,7 @@ int IUIScene_StartGame::TrialTexturePackWarningReturned(void *pParam,int iPad,C4
 
 int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	IUIScene_StartGame* pScene = (IUIScene_StartGame*)pParam;
+	IUIScene_StartGame* pScene = static_cast<IUIScene_StartGame *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -279,7 +279,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStora
 			ULONGLONG ullIndexA[1];
 			DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(pScene->m_pDLCPack->getPurchaseOfferId());
 
-			if(pDLCInfo!=NULL)
+			if(pDLCInfo!=nullptr)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Full;
 			}
@@ -289,9 +289,9 @@ int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStora
 			}
 
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 #elif defined _XBOX_ONE
-			//StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,NULL,NULL);
+			//StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,nullptr,nullptr);
 #endif
 
 			// the license change coming in when the offer has been installed will cause this scene to refresh	
@@ -311,7 +311,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStora
 
 int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	IUIScene_StartGame *pClass = (IUIScene_StartGame *)pParam;
+	IUIScene_StartGame *pClass = static_cast<IUIScene_StartGame *>(pParam);
 
 
 #ifdef _XBOX
@@ -332,7 +332,7 @@ int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStora
 		if( result==C4JStorage::EMessage_ResultAccept ) // Full version
 		{
 			ullIndexA[0]=ullOfferID_Full;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 		}
 		else // trial version
@@ -343,7 +343,7 @@ int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStora
 			{
 
 				ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+				StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 			}
 		}		
 	}
@@ -360,7 +360,7 @@ int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStora
 				app.GetDLCFullOfferIDForPackID(pClass->m_MoreOptionsParams.dwTexturePack,ProductId);
 
 
-				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),nullptr,nullptr);
 
 				// the license change coming in when the offer has been installed will cause this scene to refresh	
 			}
diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
index 059f9b75..0b1e0df2 100644
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
@@ -8,12 +8,14 @@
 #include "..\..\ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
+#include "UI.h"
+
 IUIScene_TradingMenu::IUIScene_TradingMenu()
 {
 	m_validOffersCount = 0;
 	m_selectedSlot = 0;
 	m_offersStartIndex = 0;
-	m_menu = NULL;
+	m_menu = nullptr;
 	m_bHasUpdatedOnce = false;
 }
 
@@ -31,10 +33,10 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[getPad()] != NULL )
+	if( pMinecraft->localgameModes[getPad()] != nullptr )
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			tutorial->handleUIInput(iAction);
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(iAction))
@@ -76,7 +78,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 					shared_ptr<MultiplayerLocalPlayer> player = Minecraft::GetInstance()->localplayers[getPad()];
 					int buyAMatches = player->inventory->countMatches(buyAItem);
 					int buyBMatches = player->inventory->countMatches(buyBItem);
-					if( (buyAItem != NULL && buyAMatches >= buyAItem->count) && (buyBItem == NULL || buyBMatches >= buyBItem->count) )
+					if( (buyAItem != nullptr && buyAMatches >= buyAItem->count) && (buyBItem == nullptr || buyBMatches >= buyBItem->count) )
 					{
 						// 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading Librarian villagers for multiple �Enchanted Books� will cause the title to crash.
 						int actualShopItem = m_activeOffers.at(selectedShopItem).second;
@@ -95,7 +97,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 						}
 
 						// Send a packet to the server
-						player->connection->send( shared_ptr<TradeItemPacket>( new TradeItemPacket(m_menu->containerId, actualShopItem) ) );
+						player->connection->send(std::make_shared<TradeItemPacket>(m_menu->containerId, actualShopItem));
 
 						updateDisplay();
 					}
@@ -152,7 +154,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 			ByteArrayOutputStream rawOutput;
 			DataOutputStream output(&rawOutput);
 			output.writeInt(actualShopItem);
-			Minecraft::GetInstance()->getConnection(getPad())->send(shared_ptr<CustomPayloadPacket>( new CustomPayloadPacket(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray())));
+			Minecraft::GetInstance()->getConnection(getPad())->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray()));
 		}
 	}
 	return handled;
@@ -162,7 +164,7 @@ void IUIScene_TradingMenu::handleTick()
 {
 	int offerCount = 0;
 	MerchantRecipeList *offers = m_merchant->getOffers(Minecraft::GetInstance()->localplayers[getPad()]);
-	if (offers != NULL)
+	if (offers != nullptr)
 	{
 		offerCount = offers->size();
 
@@ -181,7 +183,7 @@ void IUIScene_TradingMenu::updateDisplay()
 	int iA = -1;
 
 	MerchantRecipeList *unfilteredOffers = m_merchant->getOffers(Minecraft::GetInstance()->localplayers[getPad()]);
-	if (unfilteredOffers != NULL)
+	if (unfilteredOffers != nullptr)
 	{
 		m_activeOffers.clear();
 		int unfilteredIndex = 0;
@@ -205,7 +207,7 @@ void IUIScene_TradingMenu::updateDisplay()
 				ByteArrayOutputStream rawOutput;
 				DataOutputStream output(&rawOutput);
 				output.writeInt(firstValidTrade);
-				Minecraft::GetInstance()->getConnection(getPad())->send(shared_ptr<CustomPayloadPacket>( new CustomPayloadPacket(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray())));
+				Minecraft::GetInstance()->getConnection(getPad())->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray()));
 			}
 		}
 
@@ -241,7 +243,7 @@ void IUIScene_TradingMenu::updateDisplay()
 			// 4J-PB - need to get the villager type here
 			wsTemp = app.GetString(IDS_VILLAGER_OFFERS_ITEM);
 			wsTemp = replaceAll(wsTemp,L"{*VILLAGER_TYPE*}",m_merchant->getDisplayName());
-			int iPos=wsTemp.find(L"%s");
+			size_t iPos=wsTemp.find(L"%s");
 			wsTemp.replace(iPos,2,activeRecipe->getSellItem()->getHoverName());
 
 			setTitle(wsTemp.c_str());
@@ -255,10 +257,10 @@ void IUIScene_TradingMenu::updateDisplay()
 			setRequest1Item(buyAItem);
 			setRequest2Item(buyBItem);
 
-			if(buyAItem != NULL) setRequest1Name(buyAItem->getHoverName());
+			if(buyAItem != nullptr) setRequest1Name(buyAItem->getHoverName());
 			else setRequest1Name(L"");
 
-			if(buyBItem != NULL) setRequest2Name(buyBItem->getHoverName());
+			if(buyBItem != nullptr) setRequest2Name(buyBItem->getHoverName());
 			else setRequest2Name(L"");
 
 			bool canMake = true;
@@ -284,15 +286,15 @@ void IUIScene_TradingMenu::updateDisplay()
 			}
 			else
 			{
-				if(buyBItem!=NULL)
+				if(buyBItem!=nullptr)
 				{
 					setRequest2RedBox(true);
 					canMake = false;
 				}
 				else
 				{
-					setRequest2RedBox(buyBItem != NULL);
-					canMake = canMake && buyBItem == NULL;
+					setRequest2RedBox(buyBItem != nullptr);
+					canMake = canMake && buyBItem == nullptr;
 				}
 			}
 
@@ -320,7 +322,7 @@ void IUIScene_TradingMenu::updateDisplay()
 bool IUIScene_TradingMenu::canMake(MerchantRecipe *recipe)
 {
 	bool canMake = false;
-	if (recipe != NULL)
+	if (recipe != nullptr)
 	{
 		if(recipe->isDeprecated()) return false;
 
@@ -335,7 +337,7 @@ bool IUIScene_TradingMenu::canMake(MerchantRecipe *recipe)
 		}
 		else
 		{
-			canMake = buyAItem == NULL;
+			canMake = buyAItem == nullptr;
 		}
 
 		int buyBMatches = player->inventory->countMatches(buyBItem);
@@ -345,7 +347,7 @@ bool IUIScene_TradingMenu::canMake(MerchantRecipe *recipe)
 		}
 		else
 		{
-			canMake = canMake && buyBItem == NULL;
+			canMake = canMake && buyBItem == nullptr;
 		}
 	}
 	return canMake;
diff --git a/Minecraft.Client/Common/UI/UI.h b/Minecraft.Client/Common/UI/UI.h
index 428b3b90..a7c416f8 100644
--- a/Minecraft.Client/Common/UI/UI.h
+++ b/Minecraft.Client/Common/UI/UI.h
@@ -123,4 +123,6 @@
 #include "UIScene_TeleportMenu.h"
 #include "UIScene_EndPoem.h"
 #include "UIScene_EULA.h"
-#include "UIScene_NewUpdateMessage.h"
\ No newline at end of file
+#include "UIScene_NewUpdateMessage.h"
+
+extern ConsoleUIController ui;
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIBitmapFont.cpp b/Minecraft.Client/Common/UI/UIBitmapFont.cpp
index afc2b139..2b1518c4 100644
--- a/Minecraft.Client/Common/UI/UIBitmapFont.cpp
+++ b/Minecraft.Client/Common/UI/UIBitmapFont.cpp
@@ -53,42 +53,42 @@ void UIAbstractBitmapFont::registerFont()
 
 IggyFontMetrics * RADLINK UIAbstractBitmapFont::GetFontMetrics_Callback(void *user_context,IggyFontMetrics *metrics)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetFontMetrics(metrics);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetFontMetrics(metrics);
 }
 
 S32 RADLINK UIAbstractBitmapFont::GetCodepointGlyph_Callback(void *user_context,U32 codepoint)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetCodepointGlyph(codepoint);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetCodepointGlyph(codepoint);
 }
 
 IggyGlyphMetrics * RADLINK UIAbstractBitmapFont::GetGlyphMetrics_Callback(void *user_context,S32 glyph,IggyGlyphMetrics *metrics)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetGlyphMetrics(glyph,metrics);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetGlyphMetrics(glyph,metrics);
 }
 
 rrbool RADLINK UIAbstractBitmapFont::IsGlyphEmpty_Callback(void *user_context,S32 glyph)
 {
-	return ((UIAbstractBitmapFont *) user_context)->IsGlyphEmpty(glyph);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->IsGlyphEmpty(glyph);
 }
 
 F32 RADLINK UIAbstractBitmapFont::GetKerningForGlyphPair_Callback(void *user_context,S32 first_glyph,S32 second_glyph)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetKerningForGlyphPair(first_glyph,second_glyph);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetKerningForGlyphPair(first_glyph,second_glyph);
 }
 
 rrbool RADLINK UIAbstractBitmapFont::CanProvideBitmap_Callback(void *user_context,S32 glyph,F32 pixel_scale)
 {
-	return ((UIAbstractBitmapFont *) user_context)->CanProvideBitmap(glyph,pixel_scale);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->CanProvideBitmap(glyph,pixel_scale);
 }
 
 rrbool RADLINK UIAbstractBitmapFont::GetGlyphBitmap_Callback(void *user_context,S32 glyph,F32 pixel_scale,IggyBitmapCharacter *bitmap)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetGlyphBitmap(glyph,pixel_scale,bitmap);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetGlyphBitmap(glyph,pixel_scale,bitmap);
 }
 
 void RADLINK UIAbstractBitmapFont::FreeGlyphBitmap_Callback(void *user_context,S32 glyph,F32 pixel_scale,IggyBitmapCharacter *bitmap)
 {
-	return ((UIAbstractBitmapFont *) user_context)->FreeGlyphBitmap(glyph,pixel_scale,bitmap);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->FreeGlyphBitmap(glyph,pixel_scale,bitmap);
 }
 
 UIBitmapFont::UIBitmapFont(	SFontData &sfontdata )
@@ -250,15 +250,22 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 
 	// Choose a reasonable glyph scale.
 	float glyphScale = 1.0f, truePixelScale = 1.0f / m_cFontData->getFontData()->m_fAdvPerPixel;
-	F32 targetPixelScale = pixel_scale;
-	//if(!RenderManager.IsWidescreen())
-	//{
-	//	// Fix for different scales in 480
-	//	targetPixelScale = pixel_scale*2/3;
-	//}
-	while ( (0.5f + glyphScale) * truePixelScale <  targetPixelScale)
+	while ( (0.5f + glyphScale) * truePixelScale < pixel_scale)
 		glyphScale++;
 
+	// Debug: log each unique (font, pixel_scale) pair
+	{
+		static std::unordered_set<int> s_loggedScaleKeys;
+		// Encode font pointer + quantized scale into a key to log each combo once
+		int scaleKey = (int)(pixel_scale * 100.0f) ^ (int)(uintptr_t)m_cFontData;
+		if (s_loggedScaleKeys.find(scaleKey) == s_loggedScaleKeys.end() && s_loggedScaleKeys.size() < 50) {
+			s_loggedScaleKeys.insert(scaleKey);
+			float tps = truePixelScale;
+			app.DebugPrintf("[FONT-DBG] GetGlyphBitmap: font=%s glyph=%d pixel_scale=%.3f truePixelScale=%.1f glyphScale=%.0f\n",
+				m_cFontData->getFontName().c_str(), glyph, pixel_scale, tps, glyphScale);
+		}
+	}
+
 	// 4J-JEV: Debug code to check which font sizes are being used.
 #if (!defined _CONTENT_PACKAGE) && (VERBOSE_FONT_OUTPUT > 0)
 
@@ -303,9 +310,6 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 	}
 #endif
 
-	//app.DebugPrintf("Request glyph_%d (U+%.4X) at %f, converted to %f (%f)\n",
-	//				glyph, GetUnicode(glyph), pixel_scale, targetPixelScale, glyphScale);
-
 	// It is not necessary to shrink the glyph width here
 	// as its already been done in 'GetGlyphMetrics' by:
 	// > metrics->x1 = m_kerningTable[glyph] * ratio;
@@ -321,37 +325,67 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 
 	// 4J-PB - this was chopping off the top of the characters, so accented ones were losing a couple of pixels at the top
 	// DaveK has reduced the height of the accented capitalised characters, and we've dropped this from 0.65 to 0.64 
-	bitmap->top_left_y = -((S32) m_cFontData->getFontData()->m_uiGlyphHeight) * m_cFontData->getFontData()->m_fAscent;
+	bitmap->top_left_y = -static_cast<S32>(m_cFontData->getFontData()->m_uiGlyphHeight) * m_cFontData->getFontData()->m_fAscent;
 
 	bitmap->oversample = 0;
-	bitmap->point_sample = true;
-
-	// 4J-JEV:
-	// pixel_scale == font size chosen in flash.
-	// bitmap->pixel_scale_correct = (float) m_glyphHeight;	// Scales the glyph to desired size.
-	// bitmap->pixel_scale_correct = pixel_scale;			// Always the same size (not desired size).
-	// bitmap->pixel_scale_correct = pixel_scale * 0.5;		// Doubles original size.
-	// bitmap->pixel_scale_correct = pixel_scale * 2;		// Halves original size.
-	
-	// Actual scale, and possible range of scales.
-	bitmap->pixel_scale_correct = pixel_scale / glyphScale;
-	bitmap->pixel_scale_max = 99.0f;
-	bitmap->pixel_scale_min = 0.0f;
-
-	/* 4J-JEV: Some of Sean's code.
-	int glyphScaleMin = 1;
-    int glyphScaleMax = 3;
-    float actualScale = pixel_scale / glyphScale;
-    bitmap->pixel_scale_correct = actualScale;
-    bitmap->pixel_scale_min = actualScale * glyphScaleMin * 0.999f;
-    bitmap->pixel_scale_max = actualScale * glyphScaleMax * 1.001f; */
+
+#ifdef _WINDOWS64
+	// On Windows64 the window can be any size, producing fractional
+	// pixel_scale values that don't align to integer multiples of
+	// truePixelScale.  The original console code cached glyphs with a
+	// broad [truePixelScale, 99] range in the "normal" branch, which
+	// works on consoles (fixed 1080p — font sizes are exact multiples)
+	// but causes cache pollution on Windows: the first glyph cached in
+	// that range sets pixel_scale_correct for ALL subsequent requests,
+	// so different font sizes get scaled by wrong ratios, producing
+	// mixed letter sizes on screen.
+	//
+	// Fix: always use pixel_scale_correct = truePixelScale so every
+	// cache entry is consistent.  Two ranges: downscale (bilinear for
+	// smooth reduction) and upscale (point_sample for crisp pixel-art).
+	bitmap->pixel_scale_correct = truePixelScale;
+	if (pixel_scale < truePixelScale)
+	{
+		bitmap->pixel_scale_min = 0.0f;
+		bitmap->pixel_scale_max = truePixelScale;
+		bitmap->point_sample = false;
+	}
+	else
+	{
+		bitmap->pixel_scale_min = truePixelScale;
+		bitmap->pixel_scale_max = 99.0f;
+		bitmap->point_sample = true;
+	}
+#else
+	if (glyphScale <= 1 && pixel_scale < truePixelScale)
+	{
+		// Small display: pixel_scale is less than the native glyph size.
+		// Report the bitmap at its true native scale so Iggy downscales it
+		// to match the layout metrics (bilinear for smooth downscaling).
+		bitmap->pixel_scale_correct = truePixelScale;
+		bitmap->pixel_scale_min = 0.0f;
+		bitmap->pixel_scale_max = truePixelScale * 1.001f;
+		bitmap->point_sample = false;
+	}
+	else
+	{
+		// Normal/upscale case: integer-multiple scaling for pixel-art look.
+		// Console-only — fixed resolution means pixel_scale values are exact
+		// integer multiples of truePixelScale, so cache sharing is safe.
+		float actualScale = pixel_scale / glyphScale;
+		bitmap->pixel_scale_correct = actualScale;
+		bitmap->pixel_scale_min = truePixelScale;
+		bitmap->pixel_scale_max = 99.0f;
+		bitmap->point_sample = true;
+	}
+#endif
 
 	// 4J-JEV: Nothing to do with glyph placement,
 	// entirely to do with cropping your glyph out of an archive.
 	bitmap->stride_in_bytes = m_cFontData->getFontData()->m_uiGlyphMapX;
 
 	// 4J-JEV: Additional information needed to release memory afterwards.
-	bitmap->user_context_for_free = NULL;
+	bitmap->user_context_for_free = nullptr;
 
 	return true;
 }
diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
index 98b4f165..49c5d5d2 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_Chat.h"
+#include "UISplitScreenHelpers.h"
 #include "..\..\Minecraft.h"
 #include "..\..\Gui.h"
 
@@ -46,7 +47,7 @@ void UIComponent_Chat::handleTimerComplete(int id)
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	
 	bool anyVisible = false;
-	if(pMinecraft->localplayers[m_iPad]!= NULL)
+	if(pMinecraft->localplayers[m_iPad]!= nullptr)
 	{
 		Gui *pGui = pMinecraft->gui;
 		//DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) );
@@ -55,10 +56,16 @@ void UIComponent_Chat::handleTimerComplete(int id)
 			float opacity = pGui->getOpacity(m_iPad, i);
 			if( opacity > 0 )
 			{
+#ifdef _WINDOWS64
+				// Chat drawn by Gui::render with color codes. Hides Iggy chat to avoid double chats.
+				m_controlLabelBackground[i].setOpacity(0);
+				m_labelChatText[i].setOpacity(0);
+				m_labelChatText[i].setLabel(L"");
+#else
 				m_controlLabelBackground[i].setOpacity(opacity);
 				m_labelChatText[i].setOpacity(opacity);
 				m_labelChatText[i].setLabel( pGui->getMessage(m_iPad,i) );
-
+#endif
 				anyVisible = true;
 			}
 			else
@@ -96,15 +103,15 @@ void UIComponent_Chat::render(S32 width, S32 height, C4JRender::eViewportType vi
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
@@ -114,32 +121,42 @@ void UIComponent_Chat::render(S32 width, S32 height, C4JRender::eViewportType vi
 		S32 tileWidth = width;
 		S32 tileHeight = height;
 
+		bool needsYTile = false;
 		switch( viewport )
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			needsYTile = true;
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
+			needsYTile = true;
 			break;
 		}
 
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
+		F32 scale;
+		ComputeTileScale(tileWidth, tileHeight, m_movieWidth, m_movieHeight, needsYTile, scale, tileYStart);
+
+		// For vertical split, scale down to fit the full SWF height when the
+		// window is shorter than the movie (same fix as HUD).
+		if(!needsYTile && m_movieHeight > 0)
+		{
+			F32 scaleH = (F32)tileHeight / (F32)m_movieHeight;
+			if(scaleH < scale)
+				scale = scaleH;
+		}
+
+		IggyPlayerSetDisplaySize( getMovie(), (S32)(m_movieWidth * scale), (S32)(m_movieHeight * scale) );
 
 		IggyPlayerDrawTilesStart ( getMovie() );
-		
+
 		m_renderWidth = tileWidth;
 		m_renderHeight = tileHeight;
 		IggyPlayerDrawTile ( getMovie() ,
@@ -147,7 +164,7 @@ void UIComponent_Chat::render(S32 width, S32 height, C4JRender::eViewportType vi
 			tileYStart ,
 			tileXStart + tileWidth ,
 			tileYStart + tileHeight ,
-			0 ); 
+			0 );
 		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
diff --git a/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp b/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
index 240429bc..3aab5b98 100644
--- a/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
@@ -10,7 +10,7 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
 	IggyDataValue result;
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)0;	// WIN64
+	value[0].number = static_cast<F64>(0);	// WIN64
 #if defined _XBOX
 	value[0].number = (F64)1;
 #elif defined _DURANGO
@@ -22,7 +22,7 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
 #elif defined __PSVITA__
 	value[0].number = (F64)5;
 #elif defined _WINDOWS64
-	value[0].number = (F64)0;
+	value[0].number = static_cast<F64>(0);
 #endif
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value );
 }
diff --git a/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp b/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp
index d3a4c4c0..b7c4ebbd 100644
--- a/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp
@@ -2,6 +2,8 @@
 #include "UI.h"
 #include "UIComponent_MenuBackground.h"
 
+#include <algorithm>
+
 UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	m_bSplitscreen = false; 
@@ -42,15 +44,15 @@ void UIComponent_MenuBackground::render(S32 width, S32 height, C4JRender::eViewp
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
@@ -64,28 +66,33 @@ void UIComponent_MenuBackground::render(S32 width, S32 height, C4JRender::eViewp
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
+		F32 scaleW = static_cast<F32>(tileXStart + tileWidth) / static_cast<F32>(m_movieWidth);
+		F32 scaleH = static_cast<F32>(tileYStart + tileHeight) / static_cast<F32>(m_movieHeight);
+		F32 scale = (scaleW > scaleH) ? scaleW : scaleH;
+		scale = max(scale, 1.0f);
+
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(m_movieWidth * scale), static_cast<S32>(m_movieHeight * scale) );
 
 		IggyPlayerDrawTilesStart ( getMovie() );
-		
+
 		m_renderWidth = tileWidth;
 		m_renderHeight = tileHeight;
 		IggyPlayerDrawTile ( getMovie() ,
@@ -93,11 +100,15 @@ void UIComponent_MenuBackground::render(S32 width, S32 height, C4JRender::eViewp
 			tileYStart ,
 			tileXStart + tileWidth ,
 			tileYStart + tileHeight ,
-			0 ); 
+			0 );
 		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
 	{
-		UIScene::render(width, height, viewport);
+		if(m_bIsReloading) return;
+		if(!m_hasTickedOnce || !getMovie()) return;
+		ui.setupRenderPosition(0, 0);
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(ui.getScreenWidth()), static_cast<S32>(ui.getScreenHeight()) );
+		IggyPlayerDraw( getMovie() );
 	}
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
index cb6443a1..3da8174c 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
@@ -45,9 +45,9 @@ void UIComponent_Panorama::tick()
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	EnterCriticalSection(&pMinecraft->m_setLevelCS);
-	if(pMinecraft->level!=NULL)
+	if(pMinecraft->level!=nullptr)
 	{
-		__int64 i64TimeOfDay =0;
+		int64_t i64TimeOfDay =0;
 		// are we in the Nether? - Leave the time as 0 if we are, so we show daylight
 		if(pMinecraft->level->dimension->id==0)
 		{
@@ -85,46 +85,55 @@ void UIComponent_Panorama::render(S32 width, S32 height, C4JRender::eViewportTyp
 		switch( viewport )
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
 
-		if((viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) ||	(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT))
+		S32 tileXStart = 0;
+		S32 tileYStart = 0;
+		S32 tileWidth = width;
+		S32 tileHeight = height;
+
+		if((viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) || (viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT))
 		{
-			// Need to render at full height, but only the left side of the scene
-			S32 tileXStart = 0;
-			S32 tileYStart = 0;
-			S32 tileWidth = width;
-			S32 tileHeight = (S32)(ui.getScreenHeight());
-
-			IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
-
-			IggyPlayerDrawTilesStart ( getMovie() );
-		
-			m_renderWidth = tileWidth;
-			m_renderHeight = tileHeight;
-			IggyPlayerDrawTile ( getMovie() ,
-				tileXStart ,
-				tileYStart ,
-				tileXStart + tileWidth ,
-				tileYStart + tileHeight ,
-				0 ); 
-			IggyPlayerDrawTilesEnd ( getMovie() );
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 		}
 		else
 		{
-			// Need to render at full height, and full width. But compressed into the viewport
-			IggyPlayerSetDisplaySize( getMovie(), ui.getScreenWidth(), ui.getScreenHeight()/2 );
-			IggyPlayerDraw( getMovie() );
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 		}
+
+		F32 scaleW = static_cast<F32>(tileXStart + tileWidth) / static_cast<F32>(m_movieWidth);
+		F32 scaleH = static_cast<F32>(tileYStart + tileHeight) / static_cast<F32>(m_movieHeight);
+		F32 scale = (scaleW > scaleH) ? scaleW : scaleH;
+		if(scale < 1.0f) scale = 1.0f;
+
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(m_movieWidth * scale), static_cast<S32>(m_movieHeight * scale) );
+
+		IggyPlayerDrawTilesStart ( getMovie() );
+
+		m_renderWidth = tileWidth;
+		m_renderHeight = tileHeight;
+		IggyPlayerDrawTile ( getMovie() ,
+			tileXStart ,
+			tileYStart ,
+			tileXStart + tileWidth ,
+			tileYStart + tileHeight ,
+			0 );
+		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
 	{
-		UIScene::render(width, height, viewport);
+		if(m_bIsReloading) return;
+		if(!m_hasTickedOnce || !getMovie()) return;
+		ui.setupRenderPosition(0, 0);
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(ui.getScreenWidth()), static_cast<S32>(ui.getScreenHeight()) );
+		IggyPlayerDraw( getMovie() );
 	}
 }
 
diff --git a/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp b/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
index 255740c9..4f60de5f 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_Tooltips.h"
+#include "UISplitScreenHelpers.h"
 
 UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -92,18 +93,22 @@ void UIComponent_Tooltips::updateSafeZone()
 	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
 		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		safeBottom = getSafeZoneHalfHeight();
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-		safeLeft = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
+		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		safeTop = getSafeZoneHalfHeight();
@@ -111,22 +116,22 @@ void UIComponent_Tooltips::updateSafeZone()
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		safeTop = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		safeBottom = getSafeZoneHalfHeight();
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
 	default:
 		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	}
 	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);
@@ -154,8 +159,8 @@ void UIComponent_Tooltips::tick()
 		{
 			if(uiOpacityTimer<10)
 			{
-				float fStep=(80.0f-(float)ucAlpha)/10.0f;
-				fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+				float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+				fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 			}
 			else
 			{
@@ -164,7 +169,7 @@ void UIComponent_Tooltips::tick()
 		}
 		else
 		{
-			fVal=0.01f*(float)ucAlpha;
+			fVal=0.01f*static_cast<float>(ucAlpha);
 		}
 	}
 	else
@@ -174,7 +179,7 @@ void UIComponent_Tooltips::tick()
 		{
 			ucAlpha=15;
 		}
-		fVal=0.01f*(float)ucAlpha;
+		fVal=0.01f*static_cast<float>(ucAlpha);
 	}
 	setOpacity(fVal);
 
@@ -206,15 +211,15 @@ void UIComponent_Tooltips::render(S32 width, S32 height, C4JRender::eViewportTyp
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
@@ -224,32 +229,42 @@ void UIComponent_Tooltips::render(S32 width, S32 height, C4JRender::eViewportTyp
 		S32 tileWidth = width;
 		S32 tileHeight = height;
 
+		bool needsYTile = false;
 		switch( viewport )
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			needsYTile = true;
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
+			needsYTile = true;
 			break;
 		}
 
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
+		F32 scale;
+		ComputeTileScale(tileWidth, tileHeight, m_movieWidth, m_movieHeight, needsYTile, scale, tileYStart);
+
+		// For vertical split, scale down to fit the full SWF height when the
+		// window is shorter than the movie (same fix as HUD).
+		if(!needsYTile && m_movieHeight > 0)
+		{
+			F32 scaleH = (F32)tileHeight / (F32)m_movieHeight;
+			if(scaleH < scale)
+				scale = scaleH;
+		}
+
+		IggyPlayerSetDisplaySize( getMovie(), (S32)(m_movieWidth * scale), (S32)(m_movieHeight * scale) );
 
 		IggyPlayerDrawTilesStart ( getMovie() );
-		
+
 		m_renderWidth = tileWidth;
 		m_renderHeight = tileHeight;
 		IggyPlayerDrawTile ( getMovie() ,
@@ -257,7 +272,7 @@ void UIComponent_Tooltips::render(S32 width, S32 height, C4JRender::eViewportTyp
 			tileYStart ,
 			tileXStart + tileWidth ,
 			tileYStart + tileHeight ,
-			0 ); 
+			0 );
 		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
@@ -351,7 +366,7 @@ void UIComponent_Tooltips::_SetTooltip(unsigned int iToolTipId, UIString label,
 void UIComponent_Tooltips::_Relayout()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcUpdateLayout, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcUpdateLayout, 0 , nullptr );
 
 #ifdef __PSVITA__
 	// rebuild touchboxes
diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
index 3b4eb097..76d3babf 100644
--- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_TutorialPopup.h"
+#include "UISplitScreenHelpers.h"
 #include "..\..\Common\Tutorial\Tutorial.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\MultiplayerLocalPlayer.h"
@@ -12,8 +13,8 @@ UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, U
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_interactScene = NULL;
-	m_lastInteractSceneMoved = NULL;
+	m_interactScene = nullptr;
+	m_lastInteractSceneMoved = nullptr;
 	m_lastSceneMovedLeft = false;
 	m_bAllowFade = false;
 	m_iconItem = nullptr;
@@ -90,7 +91,7 @@ void UIComponent_TutorialPopup::RemoveInteractSceneReference(UIScene *scene)
 {
 	if( m_interactScene == scene )
 	{
-		m_interactScene = NULL;
+		m_interactScene = nullptr;
 	}
 }
 
@@ -132,7 +133,7 @@ void UIComponent_TutorialPopup::_SetDescription(UIScene *interactScene, const ws
 {	
 	m_interactScene = interactScene;
 	app.DebugPrintf("Setting m_interactScene to %08x\n", m_interactScene);
-	if( interactScene != m_lastInteractSceneMoved ) m_lastInteractSceneMoved = NULL;
+	if( interactScene != m_lastInteractSceneMoved ) m_lastInteractSceneMoved = nullptr;
 	if(desc.empty())
 	{
 		SetVisible( false );
@@ -212,20 +213,20 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 	if( icon != TUTORIAL_NO_ICON )
 	{
 		m_iconIsFoil = false;
-		m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(icon,1,iAuxVal));
+		m_iconItem = std::make_shared<ItemInstance>(icon, 1, iAuxVal);
 	}
 	else
 	{
 		m_iconItem = nullptr;
 		wstring openTag(L"{*ICON*}");
 		wstring closeTag(L"{*/ICON*}");
-		int iconTagStartPos = (int)temp.find(openTag);
-		int iconStartPos = iconTagStartPos + (int)openTag.length();
-		if( iconTagStartPos > 0 && iconStartPos < (int)temp.length() )
+		size_t iconTagStartPos = temp.find(openTag);
+		size_t iconStartPos = iconTagStartPos + openTag.length();
+		if( iconTagStartPos > 0 && iconStartPos < temp.length() )
 		{
-			int iconEndPos = (int)temp.find( closeTag, iconStartPos );
+			size_t iconEndPos = temp.find(closeTag, iconStartPos);
 
-			if(iconEndPos > iconStartPos && iconEndPos < (int)temp.length() )
+			if(iconEndPos > iconStartPos && iconEndPos < temp.length() )
 			{
 				wstring id = temp.substr(iconStartPos, iconEndPos - iconStartPos);
 
@@ -241,7 +242,7 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 				{
 					iAuxVal = 0;
 				}
-				m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(iconId,1,iAuxVal));
+				m_iconItem = std::make_shared<ItemInstance>(iconId, 1, iAuxVal);
 
 				temp.replace(iconTagStartPos, iconEndPos - iconTagStartPos + closeTag.length(), L"");
 			}
@@ -250,63 +251,63 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 		// remove any icon text
 		else if(temp.find(L"{*CraftingTableIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::workBench_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::workBench_Id, 1, 0);
 		}
 		else if(temp.find(L"{*SticksIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::stick_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::stick_Id, 1, 0);
 		}
 		else if(temp.find(L"{*PlanksIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenShovelIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::shovel_wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::shovel_wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenHatchetIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::hatchet_wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::hatchet_wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenPickaxeIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::pickAxe_wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::pickAxe_wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*FurnaceIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::furnace_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::furnace_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenDoorIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::door_wood,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::door_wood, 1, 0);
 		}
 		else if(temp.find(L"{*TorchIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::torch_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::torch_Id, 1, 0);
 		}
 		else if(temp.find(L"{*BoatIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::boat_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::boat_Id, 1, 0);
 		}
 		else if(temp.find(L"{*FishingRodIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::fishingRod_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::fishingRod_Id, 1, 0);
 		}
 		else if(temp.find(L"{*FishIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::fish_raw_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::fish_raw_Id, 1, 0);
 		}
 		else if(temp.find(L"{*MinecartIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::minecart_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::minecart_Id, 1, 0);
 		}
 		else if(temp.find(L"{*RailIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::rail_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::rail_Id, 1, 0);
 		}
 		else if(temp.find(L"{*PoweredRailIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::goldenRail_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::goldenRail_Id, 1, 0);
 		}
 		else if(temp.find(L"{*StructuresIcon*}")!=wstring::npos)
 		{
@@ -320,15 +321,15 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 		}
 		else if(temp.find(L"{*StoneIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::stone_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::stone_Id, 1, 0);
 		}
 		else
 		{
 			m_iconItem = nullptr;
 		}
 	}
-	if(!isFixedIcon && m_iconItem != NULL) setupIconHolder(e_ICON_TYPE_IGGY);
-	m_controlIconHolder.setVisible( isFixedIcon || m_iconItem != NULL);
+	if(!isFixedIcon && m_iconItem != nullptr) setupIconHolder(e_ICON_TYPE_IGGY);
+	m_controlIconHolder.setVisible( isFixedIcon || m_iconItem != nullptr);
 
 	return temp;
 }
@@ -341,13 +342,13 @@ wstring UIComponent_TutorialPopup::_SetImage(wstring &desc)
 
 	wstring openTag(L"{*IMAGE*}");
 	wstring closeTag(L"{*/IMAGE*}");
-	int imageTagStartPos = (int)desc.find(openTag);
-	int imageStartPos = imageTagStartPos + (int)openTag.length();
-	if( imageTagStartPos > 0 && imageStartPos < (int)desc.length() )
+	size_t imageTagStartPos = desc.find(openTag);
+	size_t imageStartPos = imageTagStartPos + openTag.length();
+	if( imageTagStartPos > 0 && imageStartPos < desc.length() )
 	{
-		int imageEndPos = (int)desc.find( closeTag, imageStartPos );
+		size_t imageEndPos = desc.find( closeTag, imageStartPos );
 
-		if(imageEndPos > imageStartPos && imageEndPos < (int)desc.length() )
+		if(imageEndPos > imageStartPos && imageEndPos < desc.length() )
 		{
 			wstring id = desc.substr(imageStartPos, imageEndPos - imageStartPos);
 			m_image.SetImagePath( id.c_str() );
@@ -425,7 +426,7 @@ wstring UIComponent_TutorialPopup::ParseDescription(int iPad, wstring &text)
 
 void UIComponent_TutorialPopup::UpdateInteractScenePosition(bool visible)
 {
-	if( m_interactScene == NULL ) return;
+	if( m_interactScene == nullptr ) return;
 
 	// 4J-PB - check this players screen section to see if we should allow the animation
 	bool bAllowAnim=false;
@@ -474,27 +475,17 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 {
 	if(viewport != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 	{
-		S32 xPos = 0;
-		S32 yPos = 0;
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		}
+		// Derive the viewport origin and fit a 16:9 box inside it (same as UIScene::render),
+		// then apply safezone nudges so the popup stays clear of screen edges.
+		F32 originX, originY, viewW, viewH;
+		GetViewportRect(ui.getScreenWidth(), ui.getScreenHeight(), viewport, originX, originY, viewW, viewH);
+
+		S32 fitW, fitH, offsetX, offsetY;
+		Fit16x9(viewW, viewH, fitW, fitH, offsetX, offsetY);
+
+		S32 xPos = static_cast<S32>(originX) + offsetX;
+		S32 yPos = static_cast<S32>(originY) + offsetY;
+
 		//Adjust for safezone
 		switch( viewport )
 		{
@@ -505,6 +496,7 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 			case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 				yPos += getSafeZoneHalfHeight();
 				break;
+			default: break;
 		}
 		switch( viewport )
 		{
@@ -515,10 +507,11 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 			case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
 				xPos -= getSafeZoneHalfWidth();
 				break;
+			default: break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
 
-		IggyPlayerSetDisplaySize( getMovie(), width, height );
+		IggyPlayerSetDisplaySize( getMovie(), fitW, fitH );
 		IggyPlayerDraw( getMovie() );
 	}
 	else
@@ -529,7 +522,7 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 
 void UIComponent_TutorialPopup::customDraw(IggyCustomDrawCallbackRegion *region)
 {
-	if(m_iconItem != NULL) customDrawSlotControl(region,m_iPad,m_iconItem,1.0f,m_iconItem->isFoil() || m_iconIsFoil,false);
+	if(m_iconItem != nullptr) customDrawSlotControl(region,m_iPad,m_iconItem,1.0f,m_iconItem->isFoil() || m_iconIsFoil,false);
 }
 
 void UIComponent_TutorialPopup::setupIconHolder(EIcons icon)
@@ -538,7 +531,7 @@ void UIComponent_TutorialPopup::setupIconHolder(EIcons icon)
 	IggyDataValue result;
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)icon;
+	value[0].number = static_cast<F64>(icon);
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetupIconHolder , 1 , value );
 
 	m_iconType = icon;
diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp
index be267ada..7582e82f 100644
--- a/Minecraft.Client/Common/UI/UIControl.cpp
+++ b/Minecraft.Client/Common/UI/UIControl.cpp
@@ -6,12 +6,14 @@
 
 UIControl::UIControl()
 {
-	m_parentScene = NULL;
+	m_parentScene = nullptr;
 	m_lastOpacity = 1.0f;
 	m_controlName = "";
 	m_isVisible = true;
 	m_bHidden = false;
 	m_eControlType = eNoControl;
+	m_id = -1;
+	m_pParentPanel = NULL;
 }
 
 bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
@@ -29,15 +31,15 @@ bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string
 	m_nameVisible = registerFastName(L"visible");
 
 	F64 fx, fy, fwidth, fheight;
-	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , NULL , &fx ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , NULL , &fy ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , NULL , &fwidth ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , NULL , &fheight );
+	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , nullptr , &fx ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , nullptr , &fy ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , nullptr , &fwidth ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , nullptr , &fheight );
 
-	m_x = (S32)fx;
-	m_y = (S32)fy;
-	m_width = (S32)Math::round(fwidth);
-	m_height = (S32)Math::round(fheight);
+	m_x = static_cast<S32>(fx);
+	m_y = static_cast<S32>(fy);
+	m_width = static_cast<S32>(Math::round(fwidth));
+	m_height = static_cast<S32>(Math::round(fheight));
 
 	return res;
 }
@@ -45,14 +47,14 @@ bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string
 void UIControl::UpdateControl()
 {
 	F64 fx, fy, fwidth, fheight;
-	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , NULL , &fx ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , NULL , &fy ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , NULL , &fwidth ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , NULL , &fheight );
-	m_x = (S32)fx;
-	m_y = (S32)fy;
-	m_width = (S32)Math::round(fwidth);
-	m_height = (S32)Math::round(fheight);
+	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , nullptr , &fx ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , nullptr , &fy ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , nullptr , &fwidth ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , nullptr , &fheight );
+	m_x = static_cast<S32>(fx);
+	m_y = static_cast<S32>(fy);
+	m_width = static_cast<S32>(Math::round(fwidth));
+	m_height = static_cast<S32>(Math::round(fheight));
 }
 
 void UIControl::ReInit()
@@ -74,7 +76,7 @@ void UIControl::ReInit()
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, m_parentScene->m_rootPath , m_funcSetAlpha , 2 , value );
 	}
 
-	IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, NULL, m_isVisible );
+	IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, nullptr, m_isVisible );
 }
 
 IggyValuePath *UIControl::getIggyValuePath()
@@ -128,7 +130,7 @@ void UIControl::setVisible(bool visible)
 {
 	if(visible != m_isVisible)
 	{
-		rrbool succ = IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, NULL, visible );
+		rrbool succ = IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, nullptr, visible );
 		if(succ) m_isVisible = visible;
 		else app.DebugPrintf("Failed to set visibility for control\n");
 	}
@@ -138,7 +140,7 @@ bool UIControl::getVisible()
 {
 	rrbool bVisible = false;
 	
-	IggyResult result = IggyValueGetBooleanRS ( getIggyValuePath() , m_nameVisible, NULL, &bVisible );
+	IggyResult result = IggyValueGetBooleanRS ( getIggyValuePath() , m_nameVisible, nullptr, &bVisible );
 	
 	m_isVisible = bVisible;
 	
diff --git a/Minecraft.Client/Common/UI/UIControl.h b/Minecraft.Client/Common/UI/UIControl.h
index 29770df2..8445af0f 100644
--- a/Minecraft.Client/Common/UI/UIControl.h
+++ b/Minecraft.Client/Common/UI/UIControl.h
@@ -38,12 +38,14 @@ protected:
 	bool m_bHidden; // set by the Remove call
 
 public:
+	UIControl *m_pParentPanel; // set by UI_MAP_ELEMENT macro during mapElementsAndNames
 
 	void setControlType(eUIControlType eType) {m_eControlType=eType;}
 	eUIControlType getControlType() {return m_eControlType;}
 	void setId(int iID) { m_id=iID; }
 	int getId() { return m_id; }
 	UIScene * getParentScene() {return m_parentScene;}
+	UIControl* getParentPanel() { return m_pParentPanel; }
 
 protected:
 	IggyValuePath m_iggyPath;
@@ -62,10 +64,8 @@ public:
 
 	virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName);
 	void UpdateControl();
-#ifdef __PSVITA__
 	void setHidden(bool bHidden) {m_bHidden=bHidden;}
 	bool getHidden(void) {return m_bHidden;}
-#endif
 
 	IggyValuePath *getIggyValuePath();
 
diff --git a/Minecraft.Client/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Common/UI/UIControl_Base.cpp
index 7a4a24e5..87c2862f 100644
--- a/Minecraft.Client/Common/UI/UIControl_Base.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Base.cpp
@@ -72,7 +72,7 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force)
 const wchar_t* UIControl_Base::getLabel()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, NULL);
+	IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, nullptr);
 
 	if(result.type == IGGY_DATATYPE_string_UTF16)
 	{
@@ -90,7 +90,7 @@ void UIControl_Base::setAllPossibleLabels(int labelCount, wchar_t labels[][256])
 
 	for(unsigned int i = 0; i < labelCount; ++i)
 	{
-		stringVal[i].string = (IggyUTF16 *)labels[i];
+		stringVal[i].string = static_cast<IggyUTF16 *>(labels[i]);
 		stringVal[i].length = wcslen(labels[i]);
 		value[i].type = IGGY_DATATYPE_string_UTF16;
 		value[i].string16 = stringVal[i];
diff --git a/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
index 68a3d655..4f0e5ca0 100644
--- a/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
@@ -60,7 +60,7 @@ void UIControl_ButtonList::ReInit()
 void UIControl_ButtonList::clearList()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_removeAllItemsFunc , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_removeAllItemsFunc , 0 , nullptr );
 
 	m_itemCount = 0;
 }
@@ -82,7 +82,7 @@ void UIControl_ButtonList::addItem(const string &label, int data)
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -159,7 +159,7 @@ void UIControl_ButtonList::setButtonLabel(int iButtonId, const wstring &label)
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcSetButtonLabel, 2 , value );
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 void UIControl_ButtonList::SetTouchFocus(S32 iX, S32 iY, bool bRepeat)
 {
 	IggyDataValue result;
diff --git a/Minecraft.Client/Common/UI/UIControl_ButtonList.h b/Minecraft.Client/Common/UI/UIControl_ButtonList.h
index 44484ac3..666b1f0a 100644
--- a/Minecraft.Client/Common/UI/UIControl_ButtonList.h
+++ b/Minecraft.Client/Common/UI/UIControl_ButtonList.h
@@ -37,7 +37,7 @@ public:
 
 	void setButtonLabel(int iButtonId, const wstring &label);
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 	void SetTouchFocus(S32 iX, S32 iY, bool bRepeat);
 	bool CanTouchTrigger(S32 iX, S32 iY);
 #endif
diff --git a/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp b/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp
index 1c3e8afe..e5f4da7a 100644
--- a/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp
@@ -60,7 +60,7 @@ void UIControl_CheckBox::init(UIString label, int id, bool checked)
 bool UIControl_CheckBox::IsChecked()
 {
 	rrbool checked = false;
-	IggyResult result = IggyValueGetBooleanRS ( &m_iggyPath , m_checkedProp, NULL, &checked );
+	IggyResult result = IggyValueGetBooleanRS ( &m_iggyPath , m_checkedProp, nullptr, &checked );
 	m_bChecked = checked;
 	return checked;
 }
diff --git a/Minecraft.Client/Common/UI/UIControl_DLCList.cpp b/Minecraft.Client/Common/UI/UIControl_DLCList.cpp
index 35e6b08a..39f8ff39 100644
--- a/Minecraft.Client/Common/UI/UIControl_DLCList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_DLCList.cpp
@@ -20,7 +20,7 @@ void UIControl_DLCList::addItem(const string &label, bool showTick, int iId)
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -41,7 +41,7 @@ void UIControl_DLCList::addItem(const wstring &label, bool showTick, int iId)
 
 	IggyStringUTF16 stringVal;
 	stringVal.string = (IggyUTF16 *)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
index fa29a137..8c275893 100644
--- a/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
@@ -74,12 +74,12 @@ void UIControl_DynamicLabel::TouchScroll(S32 iY, bool bActive)
 S32 UIControl_DynamicLabel::GetRealWidth()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , nullptr );
 
 	S32 iRealWidth = m_width;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealWidth = (S32)result.number;
+		iRealWidth = static_cast<S32>(result.number);
 	}
 	return iRealWidth;
 }
@@ -87,12 +87,12 @@ S32 UIControl_DynamicLabel::GetRealWidth()
 S32 UIControl_DynamicLabel::GetRealHeight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
 
 	S32 iRealHeight = m_height;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealHeight = (S32)result.number;
+		iRealHeight = static_cast<S32>(result.number);
 	}
 	return iRealHeight;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
index 9664dbf4..f091b0fc 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
@@ -12,7 +12,7 @@
 UIControl_EnchantmentBook::UIControl_EnchantmentBook()
 {
 	UIControl::setControlType(UIControl::eEnchantmentBook);
-	model = NULL;
+	model = nullptr;
 	last = nullptr;
 
 	time = 0;
@@ -69,12 +69,12 @@ void UIControl_EnchantmentBook::render(IggyCustomDrawCallbackRegion *region)
 
 	glEnable(GL_CULL_FACE);
 
-	if(model == NULL)
+	if(model == nullptr)
 	{
 		// Share the model the the EnchantTableRenderer
 
-		EnchantTableRenderer *etr = (EnchantTableRenderer*)TileEntityRenderDispatcher::instance->getRenderer(eTYPE_ENCHANTMENTTABLEENTITY);
-		if(etr != NULL)
+		EnchantTableRenderer *etr = static_cast<EnchantTableRenderer *>(TileEntityRenderDispatcher::instance->getRenderer(eTYPE_ENCHANTMENTTABLEENTITY));
+		if(etr != nullptr)
 		{
 			model = etr->bookModel;
 		}
@@ -96,7 +96,7 @@ void UIControl_EnchantmentBook::render(IggyCustomDrawCallbackRegion *region)
 
 void UIControl_EnchantmentBook::tickBook()
 {
-	UIScene_EnchantingMenu *m_containerScene = (UIScene_EnchantingMenu *)m_parentScene;
+	UIScene_EnchantingMenu *m_containerScene = static_cast<UIScene_EnchantingMenu *>(m_parentScene);
 	EnchantmentMenu *menu = m_containerScene->getMenu();
 	shared_ptr<ItemInstance> current = menu->getSlot(0)->getItem();
 	if (!ItemInstance::matches(current, last))
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
index f1e2735a..156f9815 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
@@ -55,7 +55,7 @@ void UIControl_EnchantmentButton::tick()
 
 void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 {
-	UIScene_EnchantingMenu *enchantingScene = (UIScene_EnchantingMenu *)m_parentScene;
+	UIScene_EnchantingMenu *enchantingScene = static_cast<UIScene_EnchantingMenu *>(m_parentScene);
 	EnchantmentMenu *menu = enchantingScene->getMenu();
 
 	float width = region->x1 - region->x0;
@@ -108,7 +108,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 		if (pMinecraft->localplayers[enchantingScene->getPad()]->experienceLevel < cost && !pMinecraft->localplayers[enchantingScene->getPad()]->abilities.instabuild)
 		{
 			col = m_textDisabledColour;
-			font->drawWordWrap(m_enchantmentString, 0, 0, (float)m_width/ss, col, (float)m_height/ss);
+			font->drawWordWrap(m_enchantmentString, 0, 0, static_cast<float>(m_width)/ss, col, static_cast<float>(m_height)/ss);
 			font = pMinecraft->font;
 			//col = (0x80ff20 & 0xfefefe) >> 1;
 			//font->drawShadow(line, (bwidth - font->width(line))/ss, 7, col);
@@ -120,7 +120,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 				//col = 0xffff80;
 				col = m_textFocusColour;
 			}
-			font->drawWordWrap(m_enchantmentString, 0, 0, (float)m_width/ss, col, (float)m_height/ss);
+			font->drawWordWrap(m_enchantmentString, 0, 0, static_cast<float>(m_width)/ss, col, static_cast<float>(m_height)/ss);
 			font = pMinecraft->font;
 			//col = 0x80ff20;
 			//font->drawShadow(line, (bwidth - font->width(line))/ss, 7, col);
@@ -137,7 +137,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 
 void UIControl_EnchantmentButton::updateState()
 {
-	UIScene_EnchantingMenu *enchantingScene = (UIScene_EnchantingMenu *)m_parentScene;
+	UIScene_EnchantingMenu *enchantingScene = static_cast<UIScene_EnchantingMenu *>(m_parentScene);
 	EnchantmentMenu *menu = enchantingScene->getMenu();
 
 	EState state = eState_Inactive;
@@ -182,7 +182,7 @@ void UIControl_EnchantmentButton::updateState()
 		IggyDataValue value[1];
 
 		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = (int)state;
+		value[0].number = static_cast<int>(state);
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcChangeState , 1 , value );
 
 		if(out == IGGY_RESULT_SUCCESS) m_lastState = state;
diff --git a/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp b/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
index 8b7eb9a1..b6bd3e47 100644
--- a/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
@@ -23,7 +23,7 @@ bool UIControl_HTMLLabel::setupControl(UIScene *scene, IggyValuePath *parent, co
 void UIControl_HTMLLabel::startAutoScroll()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcStartAutoScroll , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcStartAutoScroll , 0 , nullptr );
 }
 
 void UIControl_HTMLLabel::ReInit()
@@ -79,12 +79,12 @@ void UIControl_HTMLLabel::TouchScroll(S32 iY, bool bActive)
 S32 UIControl_HTMLLabel::GetRealWidth()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , nullptr );
 
 	S32 iRealWidth = m_width;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealWidth = (S32)result.number;
+		iRealWidth = static_cast<S32>(result.number);
 	}
 	return iRealWidth;
 }
@@ -92,12 +92,12 @@ S32 UIControl_HTMLLabel::GetRealWidth()
 S32 UIControl_HTMLLabel::GetRealHeight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
 
 	S32 iRealHeight = m_height;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealHeight = (S32)result.number;
+		iRealHeight = static_cast<S32>(result.number);
 	}
 	return iRealHeight;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp b/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp
index c34b5e87..3920e004 100644
--- a/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp
@@ -45,7 +45,7 @@ void UIControl_LeaderboardList::ReInit()
 void UIControl_LeaderboardList::clearList()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_funcResetLeaderboard , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_funcResetLeaderboard , 0 , nullptr );
 }
 
 void UIControl_LeaderboardList::setupTitles(const wstring &rank, const wstring &gamertag)
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
index 457e2028..25fc0316 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
@@ -27,10 +27,10 @@ UIControl_MinecraftHorse::UIControl_MinecraftHorse()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 }
 
 void UIControl_MinecraftHorse::render(IggyCustomDrawCallbackRegion *region)
@@ -49,7 +49,7 @@ void UIControl_MinecraftHorse::render(IggyCustomDrawCallbackRegion *region)
 	glTranslatef(xo, yo - (height / 7.5f), 50.0f);
 
 	//UIScene_InventoryMenu *containerMenu = (UIScene_InventoryMenu *)m_parentScene;
-	UIScene_HorseInventoryMenu *containerMenu = (UIScene_HorseInventoryMenu *)m_parentScene;
+	UIScene_HorseInventoryMenu *containerMenu = static_cast<UIScene_HorseInventoryMenu *>(m_parentScene);
 
 	shared_ptr<LivingEntity> entityHorse = containerMenu->m_horse;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
index d0625bce..ae65ac2b 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
@@ -19,10 +19,10 @@ UIControl_MinecraftPlayer::UIControl_MinecraftPlayer()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 }
 
 void UIControl_MinecraftPlayer::render(IggyCustomDrawCallbackRegion *region)
@@ -49,7 +49,7 @@ void UIControl_MinecraftPlayer::render(IggyCustomDrawCallbackRegion *region)
 	glScalef(-ss, ss, ss);
 	glRotatef(180, 0, 0, 1);
 
-	UIScene_InventoryMenu *containerMenu = (UIScene_InventoryMenu *)m_parentScene;
+	UIScene_InventoryMenu *containerMenu = static_cast<UIScene_InventoryMenu *>(m_parentScene);
 
 	float oybr = pMinecraft->localplayers[containerMenu->getPad()]->yBodyRot;
 	float oyr = pMinecraft->localplayers[containerMenu->getPad()]->yRot;
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp
index 41534dc2..0703919f 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp
@@ -21,7 +21,7 @@ void UIControl_PlayerList::addItem(const wstring &label, int iPlayerIcon, int iV
 
 	IggyStringUTF16 stringVal;
 	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
index d74bd185..b8c439b1 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
@@ -23,10 +23,10 @@ UIControl_PlayerSkinPreview::UIControl_PlayerSkinPreview()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 	m_customTextureUrl = L"default";
 	m_backupTexture = TN_MOB_CHAR;
@@ -55,7 +55,7 @@ UIControl_PlayerSkinPreview::UIControl_PlayerSkinPreview()
 	m_fOriginalRotation = 0.0f;
 	m_framesAnimatingRotation = 0;
 	m_bAnimatingToFacing = false;
-	m_pvAdditionalModelParts=NULL;
+	m_pvAdditionalModelParts=nullptr;
 	m_uiAnimOverrideBitmask=0L;
 }
 
@@ -167,7 +167,7 @@ void UIControl_PlayerSkinPreview::SetFacing(ESkinPreviewFacing facing, bool bAni
 
 void UIControl_PlayerSkinPreview::CycleNextAnimation()
 {
-	m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation + 1);
+	m_currentAnimation = static_cast<ESkinPreviewAnimations>(m_currentAnimation + 1);
 	if(m_currentAnimation >= e_SkinPreviewAnimation_Count) m_currentAnimation = e_SkinPreviewAnimation_Walking;
 
 	m_swingTime = 0.0f;
@@ -175,8 +175,8 @@ void UIControl_PlayerSkinPreview::CycleNextAnimation()
 
 void UIControl_PlayerSkinPreview::CyclePreviousAnimation()
 {
-	m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1);
-	if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1);
+	m_currentAnimation = static_cast<ESkinPreviewAnimations>(m_currentAnimation - 1);
+	if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = static_cast<ESkinPreviewAnimations>(e_SkinPreviewAnimation_Count - 1);
 
 	m_swingTime = 0.0f;
 }
@@ -210,7 +210,7 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
 	Lighting::turnOn();
 	//glRotatef(-45 - 90, 0, 1, 0);
 
-	glRotatef(-(float)m_xRot, 1, 0, 0);
+	glRotatef(-static_cast<float>(m_xRot), 1, 0, 0);
 
 	// 4J Stu - Turning on hideGui while we do this stops the name rendering in split-screen
 	bool wasHidingGui = pMinecraft->options->hideGui;
@@ -218,7 +218,7 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
 
 	//EntityRenderDispatcher::instance->render(pMinecraft->localplayers[0], 0, 0, 0, 0, 1);
 	EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_LOCALPLAYER);
-	if (renderer != NULL)
+	if (renderer != nullptr)
 	{
 		// 4J-PB - any additional parts to turn on for this player (skin dependent)
 		//vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
@@ -257,12 +257,12 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 	glPushMatrix();
 	glDisable(GL_CULL_FACE);
 
-	HumanoidModel *model = (HumanoidModel *)renderer->getModel();
+	HumanoidModel *model = static_cast<HumanoidModel *>(renderer->getModel());
 
 	//getAttackAnim(mob, a);
-	//if (armor != NULL) armor->attackTime = model->attackTime;
+	//if (armor != nullptr) armor->attackTime = model->attackTime;
 	//model->riding = mob->isRiding();
-	//if (armor != NULL) armor->riding = model->riding;
+	//if (armor != nullptr) armor->riding = model->riding;
 
 	// 4J Stu - Remember to reset these values once the rendering is done if you add another one
 	model->attackTime = 0;
@@ -292,7 +292,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 			{
 				m_swingTime = 0;
 			}
-			model->attackTime = m_swingTime / (float) (Player::SWING_DURATION * 3);
+			model->attackTime = m_swingTime / static_cast<float>(Player::SWING_DURATION * 3);
 			break;
 		default:
 			break;
@@ -306,7 +306,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 
 	//setupPosition(mob, x, y, z);
 	// is equivalent to
-	glTranslatef((float) x, (float) y, (float) z);
+	glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
 
 	//float bob = getBob(mob, a);
 #ifdef SKIN_PREVIEW_BOB_ANIM
@@ -383,11 +383,11 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 		double xa = sin(yr * PI / 180);
 		double za = -cos(yr * PI / 180);
 
-		float flap = (float) yd * 10;
+		float flap = static_cast<float>(yd) * 10;
 		if (flap < -6) flap = -6;
 		if (flap > 32) flap = 32;
-		float lean = (float) (xd * xa + zd * za) * 100;
-		float lean2 = (float) (xd * za - zd * xa) * 100;
+		float lean = static_cast<float>(xd * xa + zd * za) * 100;
+		float lean2 = static_cast<float>(xd * za - zd * xa) * 100;
 		if (lean < 0) lean = 0;
 
 		//float pow = 1;//mob->oBob + (bob - mob->oBob) * a;
diff --git a/Minecraft.Client/Common/UI/UIControl_Progress.cpp b/Minecraft.Client/Common/UI/UIControl_Progress.cpp
index 78e7c1d0..20dc1ff7 100644
--- a/Minecraft.Client/Common/UI/UIControl_Progress.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Progress.cpp
@@ -53,7 +53,7 @@ void UIControl_Progress::setProgress(int current)
 {
 	m_current = current;
 
-	float percent = (float)((m_current-m_min))/(m_max-m_min);
+	float percent = static_cast<float>((m_current - m_min))/(m_max-m_min);
 
 	if(percent != m_lastPercent)
 	{
diff --git a/Minecraft.Client/Common/UI/UIControl_SaveList.cpp b/Minecraft.Client/Common/UI/UIControl_SaveList.cpp
index f83454d7..5ae9c8f0 100644
--- a/Minecraft.Client/Common/UI/UIControl_SaveList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_SaveList.cpp
@@ -52,7 +52,7 @@ void UIControl_SaveList::addItem(const string &label, const wstring &iconName, i
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -74,7 +74,7 @@ void UIControl_SaveList::addItem(const wstring &label, const wstring &iconName,
 
 	IggyStringUTF16 stringVal;
 	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_Slider.cpp b/Minecraft.Client/Common/UI/UIControl_Slider.cpp
index c2168002..2d56a29c 100644
--- a/Minecraft.Client/Common/UI/UIControl_Slider.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Slider.cpp
@@ -92,12 +92,12 @@ void UIControl_Slider::SetSliderTouchPos(float fTouchPos)
 S32 UIControl_Slider::GetRealWidth()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth , 0 , nullptr );
 
 	S32 iRealWidth = m_width;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealWidth = (S32)result.number;
+		iRealWidth = static_cast<S32>(result.number);
 	}
 	return iRealWidth;
 }
diff --git a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp
index 74683a62..75bbac29 100644
--- a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp
@@ -24,7 +24,7 @@ bool UIControl_SpaceIndicatorBar::setupControl(UIScene *scene, IggyValuePath *pa
 	return success;
 }
 
-void UIControl_SpaceIndicatorBar::init(UIString label, int id, __int64 min, __int64 max)
+void UIControl_SpaceIndicatorBar::init(UIString label, int id, int64_t min, int64_t max)
 {
 	m_label = label;
 	m_id = id;
@@ -61,11 +61,11 @@ void UIControl_SpaceIndicatorBar::reset()
 	setSaveGameOffset(0.0f);
 }
 
-void UIControl_SpaceIndicatorBar::addSave(__int64 size)
+void UIControl_SpaceIndicatorBar::addSave(int64_t size)
 {
-	float startPercent = (float)((m_currentTotal-m_min))/(m_max-m_min);
+	float startPercent = static_cast<float>((m_currentTotal - m_min))/(m_max-m_min);
 
-	m_sizeAndOffsets.push_back( pair<__int64, float>(size, startPercent) );
+	m_sizeAndOffsets.push_back( pair<int64_t, float>(size, startPercent) );
 
 	m_currentTotal += size;
 	setTotalSize(m_currentTotal);
@@ -75,7 +75,7 @@ void UIControl_SpaceIndicatorBar::selectSave(int index)
 {
 	if(index >= 0 && index < m_sizeAndOffsets.size())
 	{
-		pair<__int64,float> values = m_sizeAndOffsets[index];
+		pair<int64_t,float> values = m_sizeAndOffsets[index];
 		setSaveSize(values.first);
 		setSaveGameOffset(values.second);
 	}
@@ -86,11 +86,11 @@ void UIControl_SpaceIndicatorBar::selectSave(int index)
 	}
 }
 
-void UIControl_SpaceIndicatorBar::setSaveSize(__int64 size)
+void UIControl_SpaceIndicatorBar::setSaveSize(int64_t size)
 {
 	m_currentSave = size;
 
-	float percent = (float)((m_currentSave-m_min))/(m_max-m_min);
+	float percent = static_cast<float>((m_currentSave - m_min))/(m_max-m_min);
 
 	IggyDataValue result;
 	IggyDataValue value[1];
@@ -99,9 +99,9 @@ void UIControl_SpaceIndicatorBar::setSaveSize(__int64 size)
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_setSaveSizeFunc , 1 , value );
 }
 
-void UIControl_SpaceIndicatorBar::setTotalSize(__int64 size)
+void UIControl_SpaceIndicatorBar::setTotalSize(int64_t size)
 {
-	float percent = (float)((m_currentTotal-m_min))/(m_max-m_min);
+	float percent = static_cast<float>((m_currentTotal - m_min))/(m_max-m_min);
 
 	IggyDataValue result;
 	IggyDataValue value[1];
diff --git a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h
index 8eed3944..52eb3f6d 100644
--- a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h
+++ b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h
@@ -6,28 +6,28 @@ class UIControl_SpaceIndicatorBar : public UIControl_Base
 {
 private:
 	IggyName m_setSaveSizeFunc, m_setTotalSizeFunc, m_setSaveGameOffsetFunc;
-	__int64 m_min;
-	__int64 m_max;
-	__int64 m_currentSave, m_currentTotal;
+	int64_t m_min;
+	int64_t m_max;
+	int64_t m_currentSave, m_currentTotal;
 	float m_currentOffset;
 
-	vector<pair<__int64,float> > m_sizeAndOffsets;
+	vector<pair<int64_t,float> > m_sizeAndOffsets;
 
 public:
 	UIControl_SpaceIndicatorBar();
 
 	virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName);
 
-	void init(UIString label, int id, __int64 min, __int64 max);
+	void init(UIString label, int id, int64_t min, int64_t max);
 	virtual void ReInit();
 	void reset();
 
-	void addSave(__int64 size);
+	void addSave(int64_t size);
 	void selectSave(int index);
 
 
 private:
-	void setSaveSize(__int64 size);
-	void setTotalSize(__int64 totalSize);
+	void setSaveSize(int64_t size);
+	void setTotalSize(int64_t totalSize);
 	void setSaveGameOffset(float offset);
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
index dc7bc532..8e679b7c 100644
--- a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
@@ -5,6 +5,15 @@
 UIControl_TextInput::UIControl_TextInput()
 {
 	m_bHasFocus = false;
+	m_bHasCaret = false;
+	m_bCaretChecked = false;
+#ifdef _WINDOWS64
+	m_bDirectEditing = false;
+	m_iCursorPos = 0;
+	m_iCharLimit = 0;
+	m_iDirectEditCooldown = 0;
+	m_iCaretBlinkTimer = 0;
+#endif
 }
 
 bool UIControl_TextInput::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
@@ -16,6 +25,7 @@ bool UIControl_TextInput::setupControl(UIScene *scene, IggyValuePath *parent, co
 	m_textName = registerFastName(L"text");
 	m_funcChangeState = registerFastName(L"ChangeState");
 	m_funcSetCharLimit = registerFastName(L"SetCharLimit");
+	m_funcSetCaretIndex = registerFastName(L"SetCaretIndex");
 
 	return success;
 }
@@ -81,3 +91,197 @@ void UIControl_TextInput::SetCharLimit(int iLimit)
 	value[0].number = iLimit;
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcSetCharLimit , 1 , value );
 }
+
+void UIControl_TextInput::setCaretVisible(bool visible)
+{
+	if (!m_parentScene || !m_parentScene->getMovie())
+		return;
+
+	// Check once whether this SWF's FJ_TextInput actually has a m_mcCaret child.
+	// IggyValuePathMakeNameRef always succeeds (creates a ref to undefined),
+	// so we validate by trying to read a property from the resolved path.
+	if (!m_bCaretChecked)
+	{
+		IggyValuePath caretPath;
+		if (IggyValuePathMakeNameRef(&caretPath, getIggyValuePath(), "m_mcCaret"))
+		{
+			rrbool test = false;
+			IggyResult res = IggyValueGetBooleanRS(&caretPath, m_nameVisible, NULL, &test);
+			m_bHasCaret = (res == 0);
+		}
+		else
+		{
+			m_bHasCaret = false;
+		}
+		m_bCaretChecked = true;
+	}
+	if (!m_bHasCaret)
+		return;
+
+	IggyValuePath caretPath;
+	if (IggyValuePathMakeNameRef(&caretPath, getIggyValuePath(), "m_mcCaret"))
+	{
+		IggyValueSetBooleanRS(&caretPath, m_nameVisible, NULL, visible);
+	}
+}
+
+void UIControl_TextInput::setCaretIndex(int index)
+{
+	if (!m_parentScene || !m_parentScene->getMovie())
+		return;
+
+	IggyDataValue result;
+	IggyDataValue value[1];
+	value[0].type = IGGY_DATATYPE_number;
+	value[0].number = index;
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcSetCaretIndex , 1 , value );
+}
+
+#ifdef _WINDOWS64
+
+void UIControl_TextInput::beginDirectEdit(int charLimit)
+{
+	const wchar_t* current = getLabel();
+	m_editBuffer = current ? current : L"";
+	m_textBeforeEdit = m_editBuffer;
+	m_iCursorPos = (int)m_editBuffer.length();
+	m_iCharLimit = charLimit;
+	m_bDirectEditing = true;
+	m_iDirectEditCooldown = 0;
+	m_iCaretBlinkTimer = 0;
+	g_KBMInput.ClearCharBuffer();
+	setCaretVisible(true);
+	setCaretIndex(m_iCursorPos);
+}
+
+UIControl_TextInput::EDirectEditResult UIControl_TextInput::tickDirectEdit()
+{
+	if (m_iDirectEditCooldown > 0)
+		m_iDirectEditCooldown--;
+
+	if (!m_bDirectEditing)
+	{
+		setCaretVisible(false);
+		return eDirectEdit_Continue;
+	}
+
+	// Enforce caret visibility and position every tick — setLabel() and Flash
+	// focus changes can reset both at any time.
+	setCaretVisible(true);
+	setCaretIndex(m_iCursorPos);
+
+	// For SWFs without m_mcCaret, insert '_' at the cursor position.
+	// All characters remain visible — '_' sits between them like a cursor.
+	if (!m_bHasCaret)
+	{
+		wstring display = m_editBuffer;
+		display.insert(m_iCursorPos, 1, L'_');
+		setLabel(display.c_str());
+	}
+
+	EDirectEditResult result = eDirectEdit_Continue;
+	bool changed = false;
+
+	// Consume typed characters from the KBM buffer
+	wchar_t ch;
+	while (g_KBMInput.ConsumeChar(ch))
+	{
+		if (ch == 0x08) // Backspace
+		{
+			if (m_iCursorPos > 0)
+			{
+				m_editBuffer.erase(m_iCursorPos - 1, 1);
+				m_iCursorPos--;
+				changed = true;
+			}
+		}
+		else if (ch == 0x0D) // Enter — confirm edit
+		{
+			m_bDirectEditing = false;
+			m_iDirectEditCooldown = 4;
+			setLabel(m_editBuffer.c_str(), true);
+			setCaretVisible(false);
+			return eDirectEdit_Confirmed;
+		}
+		else if (m_iCharLimit <= 0 || (int)m_editBuffer.length() < m_iCharLimit)
+		{
+			m_editBuffer.insert(m_iCursorPos, 1, ch);
+			m_iCursorPos++;
+			changed = true;
+		}
+	}
+
+	// Arrow keys, Home, End, Delete for cursor movement
+	if (g_KBMInput.IsKeyPressed(VK_LEFT) && m_iCursorPos > 0)
+	{
+		m_iCursorPos--;
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_RIGHT) && m_iCursorPos < (int)m_editBuffer.length())
+	{
+		m_iCursorPos++;
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_HOME))
+	{
+		m_iCursorPos = 0;
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_END))
+	{
+		m_iCursorPos = (int)m_editBuffer.length();
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_DELETE) && m_iCursorPos < (int)m_editBuffer.length())
+	{
+		m_editBuffer.erase(m_iCursorPos, 1);
+		changed = true;
+	}
+
+	// Escape — cancel edit and restore original text
+	if (g_KBMInput.IsKeyPressed(VK_ESCAPE))
+	{
+		m_editBuffer = m_textBeforeEdit;
+		m_bDirectEditing = false;
+		m_iDirectEditCooldown = 4;
+		setLabel(m_editBuffer.c_str());
+		setCaretVisible(false);
+		return eDirectEdit_Cancelled;
+	}
+
+	if (changed)
+	{
+		if (m_bHasCaret)
+		{
+			setLabel(m_editBuffer.c_str());
+			setCaretIndex(m_iCursorPos);
+		}
+		// SWFs without caret: the cursor block above already updates the label every tick
+	}
+
+	return eDirectEdit_Continue;
+}
+
+void UIControl_TextInput::cancelDirectEdit()
+{
+	if (m_bDirectEditing)
+	{
+		m_editBuffer = m_textBeforeEdit;
+		m_bDirectEditing = false;
+		m_iDirectEditCooldown = 4;
+		setLabel(m_editBuffer.c_str(), true);
+		setCaretVisible(false);
+	}
+}
+
+void UIControl_TextInput::confirmDirectEdit()
+{
+	if (m_bDirectEditing)
+	{
+		m_bDirectEditing = false;
+		setLabel(m_editBuffer.c_str(), true);
+		setCaretVisible(false);
+	}
+}
+
+#endif
diff --git a/Minecraft.Client/Common/UI/UIControl_TextInput.h b/Minecraft.Client/Common/UI/UIControl_TextInput.h
index 98032d85..3ff28930 100644
--- a/Minecraft.Client/Common/UI/UIControl_TextInput.h
+++ b/Minecraft.Client/Common/UI/UIControl_TextInput.h
@@ -6,7 +6,20 @@ class UIControl_TextInput : public UIControl_Base
 {
 private:
 	IggyName m_textName, m_funcChangeState, m_funcSetCharLimit;
+	IggyName m_funcSetCaretIndex;
 	bool m_bHasFocus;
+	bool m_bHasCaret;
+	bool m_bCaretChecked;
+
+#ifdef _WINDOWS64
+	bool m_bDirectEditing;
+	wstring m_textBeforeEdit;
+	wstring m_editBuffer;
+	int m_iCursorPos;
+	int m_iCharLimit;
+	int m_iDirectEditCooldown;
+	int m_iCaretBlinkTimer;
+#endif
 
 public:
 	UIControl_TextInput();
@@ -19,4 +32,24 @@ public:
 	virtual void setFocus(bool focus);
 
 	void SetCharLimit(int iLimit);
+
+	void setCaretVisible(bool visible);
+	void setCaretIndex(int index);
+
+#ifdef _WINDOWS64
+	enum EDirectEditResult
+	{
+		eDirectEdit_Continue,
+		eDirectEdit_Confirmed,
+		eDirectEdit_Cancelled,
+	};
+
+	void beginDirectEdit(int charLimit = 0);
+	EDirectEditResult tickDirectEdit();
+	void cancelDirectEdit();
+	void confirmDirectEdit();
+	bool isDirectEditing() const { return m_bDirectEditing; }
+	int getDirectEditCooldown() const { return m_iDirectEditCooldown; }
+	const wstring& getEditBuffer() const { return m_editBuffer; }
+#endif
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
index 02336e00..7f721493 100644
--- a/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
@@ -83,7 +83,7 @@ void UIControl_TexturePackList::selectSlot(int id)
 void UIControl_TexturePackList::clearSlots()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_clearSlotsFunc ,0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_clearSlotsFunc ,0 , nullptr );
 }
 
 void UIControl_TexturePackList::setEnabled(bool enable)
@@ -125,7 +125,7 @@ bool UIControl_TexturePackList::CanTouchTrigger(S32 iX, S32 iY)
 	S32 bCanTouchTrigger = false;
 	if(result.type == IGGY_DATATYPE_boolean)
 	{
-		bCanTouchTrigger = (bool)result.boolval;
+		bCanTouchTrigger = static_cast<bool>(result.boolval);
 	}
 	return bCanTouchTrigger;
 }
@@ -133,12 +133,12 @@ bool UIControl_TexturePackList::CanTouchTrigger(S32 iX, S32 iY)
 S32 UIControl_TexturePackList::GetRealHeight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
 
 	S32 iRealHeight = m_height;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealHeight = (S32)result.number;
+		iRealHeight = static_cast<S32>(result.number);
 	}
 	return iRealHeight;
 }
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 5375b784..b12ea5e7 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -3,6 +3,7 @@
 #include "UI.h"
 #include "UIScene.h"
 #include "UIControl_Slider.h"
+#include "UIControl_TexturePackList.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\LocalPlayer.h"
 #include "..\..\DLCTexturePack.h"
@@ -12,6 +13,7 @@
 #include "..\..\EnderDragonRenderer.h"
 #include "..\..\MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
+#include "UISplitScreenHelpers.h"
 #ifdef _WINDOWS64
 #include "..\..\Windows64\KeyboardMouseInput.h"
 #endif
@@ -56,18 +58,20 @@ bool UIController::ms_bReloadSkinCSInitialised = false;
 
 DWORD UIController::m_dwTrialTimerLimitSecs=DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME;
 
+// GetViewportRect and Fit16x9 are now in UISplitScreenHelpers.h
+
 #ifdef _WINDOWS64
 static UIControl_Slider *FindSliderById(UIScene *pScene, int sliderId)
 {
 	vector<UIControl *> *controls = pScene->GetControls();
-	if (!controls) return NULL;
+	if (!controls) return nullptr;
 	for (size_t i = 0; i < controls->size(); ++i)
 	{
 		UIControl *ctrl = (*controls)[i];
 		if (ctrl && ctrl->getControlType() == UIControl::eSlider && ctrl->getId() == sliderId)
-			return (UIControl_Slider *)ctrl;
+			return static_cast<UIControl_Slider *>(ctrl);
 	}
-	return NULL;
+	return nullptr;
 }
 #endif
 
@@ -143,11 +147,11 @@ extern "C" void *__real_malloc(size_t t);
 extern "C" void __real_free(void *t);
 #endif
 
-__int64 UIController::iggyAllocCount = 0;
+int64_t UIController::iggyAllocCount = 0;
 static unordered_map<void *,size_t> allocations;
 static void * RADLINK AllocateFunction ( void * alloc_callback_user_data , size_t size_requested , size_t * size_returned )
 {
-	UIController *controller = (UIController *)alloc_callback_user_data;
+	UIController *controller = static_cast<UIController *>(alloc_callback_user_data);
 	EnterCriticalSection(&controller->m_Allocatorlock);
 #ifdef EXCLUDE_IGGY_ALLOCATIONS_FROM_HEAP_INSPECTOR
 	void *alloc = __real_malloc(size_requested);
@@ -164,7 +168,7 @@ static void * RADLINK AllocateFunction ( void * alloc_callback_user_data , size_
 
 static void RADLINK DeallocateFunction ( void * alloc_callback_user_data , void * ptr )
 {
-	UIController *controller = (UIController *)alloc_callback_user_data;
+	UIController *controller = static_cast<UIController *>(alloc_callback_user_data);
 	EnterCriticalSection(&controller->m_Allocatorlock);
 	size_t size = allocations[ptr];
 	UIController::iggyAllocCount -= size;
@@ -180,15 +184,15 @@ static void RADLINK DeallocateFunction ( void * alloc_callback_user_data , void
 
 UIController::UIController()
 {
-	m_uiDebugConsole = NULL;
-	m_reloadSkinThread = NULL;
+	m_uiDebugConsole = nullptr;
+	m_reloadSkinThread = nullptr;
 
 	m_navigateToHomeOnReload = false;
 
 	m_bCleanupOnReload = false;
-	m_mcTTFFont = NULL;
-	m_moj7 = NULL;
-	m_moj11 = NULL;
+	m_mcTTFFont = nullptr;
+	m_moj7 = nullptr;
+	m_moj11 = nullptr;
 
 	// 4J-JEV: It's important that these remain the same, unless updateCurrentLanguage is going to be called.
 	m_eCurrentFont = m_eTargetFont = eFont_NotLoaded;
@@ -237,6 +241,8 @@ UIController::UIController()
 	m_winUserIndex = 0;
 	m_mouseDraggingSliderScene = eUIScene_COUNT;
 	m_mouseDraggingSliderId = -1;
+	m_mouseClickConsumedByScene = false;
+	m_bMouseHoverHorizontalList = false;
 	m_lastHoverMouseX = -1;
 	m_lastHoverMouseY = -1;
 	m_accumulatedTicks = 0;
@@ -267,7 +273,7 @@ void UIController::SetSysUIShowing(bool bVal)
 
 void UIController::SetSystemUIShowing(LPVOID lpParam,bool bVal)
 {
-	UIController *pClass=(UIController *)lpParam;
+	UIController *pClass=static_cast<UIController *>(lpParam);
 	pClass->SetSysUIShowing(bVal);
 }
 
@@ -307,13 +313,13 @@ void UIController::postInit()
 
 	for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
 	{
-		m_groups[i] = new UIGroup((EUIGroup)i,i-1);
+		m_groups[i] = new UIGroup(static_cast<EUIGroup>(i),i-1);
 	}
 
 
 #ifdef ENABLE_IGGY_EXPLORER
 	iggy_explorer = IggyExpCreate("127.0.0.1", 9190, malloc(IGGYEXP_MIN_STORAGE), IGGYEXP_MIN_STORAGE);
-	if ( iggy_explorer == NULL )
+	if ( iggy_explorer == nullptr )
 	{
 		// not normally an error, just an error for this demo!
 		app.DebugPrintf( "Couldn't connect to Iggy Explorer, did you run it first?" );
@@ -326,7 +332,7 @@ void UIController::postInit()
 
 #ifdef ENABLE_IGGY_PERFMON
 	m_iggyPerfmonEnabled = false;
-	iggy_perfmon = IggyPerfmonCreate(perf_malloc, perf_free, NULL);
+	iggy_perfmon = IggyPerfmonCreate(perf_malloc, perf_free, nullptr);
 	IggyInstallPerfmon(iggy_perfmon);
 #endif
 
@@ -367,7 +373,7 @@ UITTFFont *UIController::createFont(EFont fontLanguage)
 #endif
 	// 4J-JEV, Cyrillic characters have been added to this font now, (4/July/14)
 	// XC_LANGUAGE_RUSSIAN and XC_LANGUAGE_GREEK:
-	default:					return NULL;
+	default:					return nullptr;
 	}
 }
 
@@ -394,17 +400,17 @@ void UIController::SetupFont()
 	if (m_eCurrentFont != eFont_NotLoaded)	app.DebugPrintf("[UIController] Font switch required for language transition to %i.\n", nextLanguage);
 	else									app.DebugPrintf("[UIController] Initialising font for language %i.\n", nextLanguage);
 
-	if (m_mcTTFFont != NULL)
+	if (m_mcTTFFont != nullptr)
 	{
 		delete m_mcTTFFont;
-		m_mcTTFFont = NULL;
+		m_mcTTFFont = nullptr;
 	}
 
 	if(m_eTargetFont == eFont_Bitmap)
 	{
 		// these may have been set up by a previous language being chosen
-		if (m_moj7 == NULL)		m_moj7  = new UIBitmapFont(SFontData::Mojangles_7);
-		if (m_moj11 == NULL)	m_moj11 = new UIBitmapFont(SFontData::Mojangles_11);
+		if (m_moj7 == nullptr)		m_moj7  = new UIBitmapFont(SFontData::Mojangles_7);
+		if (m_moj11 == nullptr)	m_moj11 = new UIBitmapFont(SFontData::Mojangles_11);
 
 		// 4J-JEV: Ensure we redirect to them correctly, even if the objects were previously initialised.
 		m_moj7->registerFont();
@@ -499,7 +505,7 @@ void UIController::tick()
 	}
 
 	// Clear out the cached movie file data
-	__int64 currentTime = System::currentTimeMillis();
+	int64_t currentTime = System::currentTimeMillis();
     for (auto it = m_cachedMovieData.begin(); it != m_cachedMovieData.end();)
     {
 		if(it->second.m_expiry < currentTime)
@@ -516,52 +522,23 @@ void UIController::tick()
 
 void UIController::loadSkins()
 {
-	wstring platformSkinPath = L"";
-
 #ifdef __PS3__
-	platformSkinPath = L"skinPS3.swf";
-#elif defined __PSVITA__
-	platformSkinPath = L"skinVita.swf";
-#elif defined _WINDOWS64
-	if(m_fScreenHeight>720.0f)
-	{
-		platformSkinPath = L"skinHDWin.swf";
-	}
-	else
-	{
-		platformSkinPath = L"skinWin.swf";
-	}
-#elif defined _DURANGO
-	if(m_fScreenHeight>720.0f)
-	{
-		platformSkinPath = L"skinHDDurango.swf";
-	}
-	else
-	{
-		platformSkinPath = L"skinDurango.swf";
-	}
-#elif defined __ORBIS__
-	if(m_fScreenHeight>720.0f)
-	{
-		platformSkinPath = L"skinHDOrbis.swf";
-	}
-	else
-	{
-		platformSkinPath = L"skinOrbis.swf";
-	}
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinPS3.swf", L"platformskin.swf");
 
-#endif
-	// Every platform has one of these, so nothing shared
-	if(m_fScreenHeight>720.0f)
-	{
-		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf");
-	}
-	else
-	{
-		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskin.swf");
-	}
+	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
+	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
+	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
+	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
+	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
+	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
+	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
+	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
+	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
+	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
+
+#elif defined __PSVITA__
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinVita.swf", L"platformskin.swf");
 
-#if defined(__PS3__) || defined(__PSVITA__)
 	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
 	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
 	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
@@ -572,13 +549,14 @@ void UIController::loadSkins()
 	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
 	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
 	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
-#endif
 
-#if ( defined(_WINDOWS64) || defined(_DURANGO) || defined(__ORBIS__) )
+#elif defined _WINDOWS64
+	// HD platform skin — required by skinHD*.swf (1080p scene SWFs)
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDWin.swf", L"platformskinHD.swf");
+	// Non-HD platform skin — required by skin*.swf (720p/480p scene SWFs)
+	m_iggyLibraries[eLibraryFallback_Platform] = loadSkin(L"skinWin.swf", L"platformskin.swf");
 
-#if defined(_WINDOWS64)
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
+	// Non-HD skin set (720p/480p scenes import these)
 	m_iggyLibraries[eLibraryFallback_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
 	m_iggyLibraries[eLibraryFallback_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
 	m_iggyLibraries[eLibraryFallback_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
@@ -589,9 +567,8 @@ void UIController::loadSkins()
 	m_iggyLibraries[eLibraryFallback_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
 	m_iggyLibraries[eLibraryFallback_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
 	m_iggyLibraries[eLibraryFallback_Default] = loadSkin(L"skin.swf", L"skin.swf");
-#endif
-#endif
 
+	// HD skin set (1080p scenes import these)
 	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
 	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
 	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
@@ -602,7 +579,35 @@ void UIController::loadSkins()
 	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
 	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
 	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
-#endif // HD platforms
+
+#elif defined _DURANGO
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDDurango.swf", L"platformskinHD.swf");
+
+	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
+	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
+	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
+	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
+	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
+	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
+	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
+	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
+	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
+	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
+
+#elif defined __ORBIS__
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDOrbis.swf", L"platformskinHD.swf");
+
+	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
+	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
+	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
+	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
+	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
+	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
+	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
+	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
+	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
+	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
+#endif
 }
 
 IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinName)
@@ -612,20 +617,20 @@ IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinN
 	if(!skinPath.empty() && app.hasArchiveFile(skinPath))
 	{
 		byteArray baFile = app.getArchiveFile(skinPath);
-		lib = IggyLibraryCreateFromMemoryUTF16( (IggyUTF16 *)skinName.c_str() , (void *)baFile.data, baFile.length, NULL );
+		lib = IggyLibraryCreateFromMemoryUTF16( (IggyUTF16 *)skinName.c_str() , (void *)baFile.data, baFile.length, nullptr );
 
 		delete[] baFile.data;
 #ifdef _DEBUG
 		IggyMemoryUseInfo memoryInfo;
 		rrbool res;
 		int iteration = 0;
-		__int64 totalStatic = 0;
-		while(res = IggyDebugGetMemoryUseInfo ( NULL ,
-			lib ,
-			"" ,
-			0 ,
-			iteration ,
-			&memoryInfo ))
+		int64_t totalStatic = 0;
+		while(res = IggyDebugGetMemoryUseInfo (nullptr,
+                                               lib ,
+                                               "" ,
+                                               0 ,
+                                               iteration ,
+                                               &memoryInfo ))
 		{
 			totalStatic += memoryInfo.static_allocation_bytes;
 			app.DebugPrintf(app.USER_SR, "%ls - %.*s, static: %dB, dynamic: %dB\n", skinPath.c_str(), memoryInfo.subcategory_stringlen, memoryInfo.subcategory, memoryInfo.static_allocation_bytes, memoryInfo.dynamic_allocation_bytes);
@@ -689,7 +694,7 @@ void UIController::StartReloadSkinThread()
 int UIController::reloadSkinThreadProc(void* lpParam)
 {
 	EnterCriticalSection(&ms_reloadSkinCS);		// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
-	UIController *controller = (UIController *)lpParam;
+	UIController *controller = static_cast<UIController *>(lpParam);
 	// Load new skin
 	controller->loadSkins();
 
@@ -724,7 +729,7 @@ bool UIController::IsExpectingOrReloadingSkin()
 void UIController::CleanUpSkinReload()
 {
 	delete m_reloadSkinThread;
-	m_reloadSkinThread = NULL;
+	m_reloadSkinThread = nullptr;
 
 	if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 	{
@@ -750,7 +755,7 @@ void UIController::CleanUpSkinReload()
 byteArray UIController::getMovieData(const wstring &filename)
 {
 	// Cache everything we load in the current tick
-	__int64 targetTime = System::currentTimeMillis() + (1000LL * 60);
+	int64_t targetTime = System::currentTimeMillis() + (1000LL * 60);
     auto it = m_cachedMovieData.find(filename);
     if(it == m_cachedMovieData.end() )
 	{
@@ -784,40 +789,56 @@ void UIController::tickInput()
 #endif
 		{
 #ifdef _WINDOWS64
-			if (!g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
+            m_mouseClickConsumedByScene = false;
+            if (!g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
+            {
+                UIScene *pScene = nullptr;
+
+                // Search by layer priority across all groups (layer-first).
+                // Tooltip layer is skipped because it holds non-interactive
+                // overlays (button hints, timer) that should never capture mouse.
+                // Old group-first order found those tooltips on eUIGroup_Fullscreen
+                // before reaching in-game menus on eUIGroup_Player1.
+                static const EUILayer mouseLayers[] = {
+#ifndef _CONTENT_PACKAGE
+                    eUILayer_Debug,
+#endif
+					eUILayer_Error,
+					eUILayer_Alert,
+					eUILayer_Popup,
+					eUILayer_Fullscreen,
+					eUILayer_Scene,
+				};
+				// Only check the fullscreen group and the primary (KBM) player's group.
+			// Other splitscreen players use controllers — mouse must not affect them.
+			const int mouseGroups[] = { static_cast<int>(eUIGroup_Fullscreen), ProfileManager.GetPrimaryPad() + 1 };
+			for (int l = 0; l < _countof(mouseLayers) && !pScene; ++l)
 			{
-				UIScene *pScene = NULL;
-				for (int grp = 0; grp < eUIGroup_COUNT && !pScene; ++grp)
+				for (int g = 0; g < _countof(mouseGroups) && !pScene; ++g)
 				{
-					pScene = m_groups[grp]->GetTopScene(eUILayer_Debug);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Tooltips);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Error);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Alert);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Popup);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Fullscreen);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Scene);
+					pScene = m_groups[mouseGroups[g]]->GetTopScene(mouseLayers[l]);
 				}
+			}
 				if (pScene && pScene->getMovie())
-				{
-					Iggy *movie = pScene->getMovie();
-					int rawMouseX = g_KBMInput.GetMouseX();
-					int rawMouseY = g_KBMInput.GetMouseY();
-					F32 mouseX = (F32)rawMouseX;
-					F32 mouseY = (F32)rawMouseY;
-
-					extern HWND g_hWnd;
-					if (g_hWnd)
-					{
-						RECT rc;
-						GetClientRect(g_hWnd, &rc);
-						int winW = rc.right - rc.left;
-						int winH = rc.bottom - rc.top;
-						if (winW > 0 && winH > 0)
-						{
-							mouseX = mouseX * (m_fScreenWidth / (F32)winW);
-							mouseY = mouseY * (m_fScreenHeight / (F32)winH);
-						}
-					}
+                {
+                    int rawMouseX = g_KBMInput.GetMouseX();
+                    int rawMouseY = g_KBMInput.GetMouseY();
+                    F32 mouseX = static_cast<F32>(rawMouseX);
+                    F32 mouseY = static_cast<F32>(rawMouseY);
+
+                    extern HWND g_hWnd;
+                    if (g_hWnd)
+                    {
+                        RECT rc;
+                        GetClientRect(g_hWnd, &rc);
+                        int winW = rc.right - rc.left;
+                        int winH = rc.bottom - rc.top;
+                        if (winW > 0 && winH > 0)
+                        {
+                            mouseX = mouseX * (m_fScreenWidth / static_cast<F32>(winW));
+                            mouseY = mouseY * (m_fScreenHeight / static_cast<F32>(winH));
+                        }
+                    }
 
 					// Only update hover focus when the mouse has actually moved,
 					// so that mouse-wheel scrolling can change list selection
@@ -826,43 +847,48 @@ void UIController::tickInput()
 					m_lastHoverMouseX = rawMouseX;
 					m_lastHoverMouseY = rawMouseY;
 
-					if (mouseMoved)
+					// Convert mouse window-pixel coords to Flash/SWF authoring coords.
+					// In split-screen the scene is rendered at a tile-origin offset
+					// and at a smaller display size, so we must:
+					//   1. Map window pixels -> UIController screen space
+					//   2. Subtract the viewport tile origin
+					//   3. Scale from display dimensions to SWF authoring dimensions
+					F32 sceneMouseX = static_cast<F32>(rawMouseX);
+					F32 sceneMouseY = static_cast<F32>(rawMouseY);
 					{
-						IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
-						IggyFocusableObject focusables[64];
-						S32 numFocusables = 0;
-						IggyPlayerGetFocusableObjects(movie, &currentFocus, focusables, 64, &numFocusables);
-
-						if (numFocusables > 0 && numFocusables <= 64)
+						extern HWND g_hWnd;
+						RECT rc;
+						if (g_hWnd && GetClientRect(g_hWnd, &rc))
 						{
-							IggyFocusHandle hitObject = IGGY_FOCUS_NULL;
-							for (S32 i = 0; i < numFocusables; ++i)
+							int winW = rc.right - rc.left;
+							int winH = rc.bottom - rc.top;
+							if (winW > 0 && winH > 0)
 							{
-								if (mouseX >= focusables[i].x0 && mouseX <= focusables[i].x1 &&
-									mouseY >= focusables[i].y0 && mouseY <= focusables[i].y1)
+								// Step 1: window pixels -> screen space
+								F32 screenX = sceneMouseX * (getScreenWidth() / static_cast<F32>(winW));
+								F32 screenY = sceneMouseY * (getScreenHeight() / static_cast<F32>(winH));
+
+								// Step 2 & 3: account for split-screen viewport
+								C4JRender::eViewportType vp = pScene->GetParentLayer()->getViewport();
+								S32 displayW = 0, displayH = 0;
+								getRenderDimensions(vp, displayW, displayH);
+
+								F32 vpOriginX, vpOriginY, vpW, vpH;
+								GetViewportRect(getScreenWidth(), getScreenHeight(), vp, vpOriginX, vpOriginY, vpW, vpH);
+								// All viewports use Fit16x9 for menu scenes
+								S32 fitW, fitH, fitOffsetX, fitOffsetY;
+								Fit16x9(vpW, vpH, fitW, fitH, fitOffsetX, fitOffsetY);
+								S32 originX = static_cast<S32>(vpOriginX) + fitOffsetX;
+								S32 originY = static_cast<S32>(vpOriginY) + fitOffsetY;
+								displayW = fitW;
+								displayH = fitH;
+
+								if (displayW > 0 && displayH > 0)
 								{
-									hitObject = focusables[i].object;
-									break;
+									sceneMouseX = (screenX - originX) * (static_cast<F32>(pScene->getRenderWidth()) / static_cast<F32>(displayW));
+									sceneMouseY = (screenY - originY) * (static_cast<F32>(pScene->getRenderHeight()) / static_cast<F32>(displayH));
 								}
 							}
-
-							if (hitObject != currentFocus)
-							{
-								IggyPlayerSetFocusRS(movie, hitObject, 0);
-							}
-						}
-					}
-
-					// Convert mouse to scene/movie coordinates for slider hit testing
-					F32 sceneMouseX = mouseX;
-					F32 sceneMouseY = mouseY;
-					{
-						S32 displayWidth = 0, displayHeight = 0;
-						pScene->GetParentLayer()->getRenderDimensions(displayWidth, displayHeight);
-						if (displayWidth > 0 && displayHeight > 0)
-						{
-							sceneMouseX = mouseX * ((F32)pScene->getRenderWidth() / (F32)displayWidth);
-							sceneMouseY = mouseY * ((F32)pScene->getRenderHeight() / (F32)displayHeight);
 						}
 					}
 
@@ -876,6 +902,110 @@ void UIController::tickInput()
 						panelOffsetY = pMainPanel->getYPos();
 					}
 
+					// Mouse hover — hit test against C++ control bounds.
+					// Simple controls use SetFocusToElement; list controls
+					// use their own SetTouchFocus for Flash-side hit testing.
+					if (mouseMoved)
+					{
+						m_bMouseHoverHorizontalList = false;
+						vector<UIControl *> *controls = pScene->GetControls();
+						if (controls)
+						{
+							int hitControlId = -1;
+							S32 hitArea = INT_MAX;
+							UIControl *hitCtrl = NULL;
+							for (size_t i = 0; i < controls->size(); ++i)
+							{
+								UIControl *ctrl = (*controls)[i];
+								if (!ctrl || ctrl->getHidden() || !ctrl->getVisible() || ctrl->getId() < 0)
+									continue;
+
+								UIControl::eUIControlType type = ctrl->getControlType();
+								if (type != UIControl::eButton && type != UIControl::eTextInput &&
+									type != UIControl::eCheckBox && type != UIControl::eSlider &&
+									type != UIControl::eButtonList && type != UIControl::eTexturePackList)
+									continue;
+
+								// If the scene has an active panel (e.g. tab menus),
+								// skip controls that aren't children of that panel.
+								if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+									continue;
+
+								ctrl->UpdateControl();
+								S32 cx = ctrl->getXPos() + panelOffsetX;
+								S32 cy = ctrl->getYPos() + panelOffsetY;
+								S32 cw = ctrl->getWidth();
+								S32 ch = ctrl->getHeight();
+								// TexturePackList origin is where the slot area starts,
+								// not the top-left of the whole control — use GetRealHeight.
+								if (type == UIControl::eTexturePackList)
+									ch = static_cast<UIControl_TexturePackList*>(ctrl)->GetRealHeight();
+								if (cw <= 0 || ch <= 0)
+									continue;
+
+								if (sceneMouseX >= cx && sceneMouseX <= cx + cw &&
+									sceneMouseY >= cy && sceneMouseY <= cy + ch)
+								{
+									if (type == UIControl::eButtonList)
+									{
+										// ButtonList manages focus internally via Flash —
+										// pass mouse coords so it can highlight the right item.
+										static_cast<UIControl_ButtonList*>(ctrl)->SetTouchFocus(
+											static_cast<S32>(sceneMouseX), static_cast<S32>(sceneMouseY), false);
+										hitControlId = -1;
+										hitArea = INT_MAX;
+										hitCtrl = NULL;
+										break; // ButtonList takes priority
+									}
+									if (type == UIControl::eTexturePackList)
+									{
+										// TexturePackList expects coords relative to its origin.
+										UIControl_TexturePackList *pList = static_cast<UIControl_TexturePackList*>(ctrl);
+										pScene->SetFocusToElement(ctrl->getId());
+										pList->SetTouchFocus(
+											static_cast<S32>(sceneMouseX - cx), static_cast<S32>(sceneMouseY - cy), false);
+										m_bMouseHoverHorizontalList = true;
+										hitControlId = -1;
+										hitArea = INT_MAX;
+										hitCtrl = NULL;
+										break;
+									}
+									S32 area = cw * ch;
+									if (area < hitArea)
+									{
+										hitControlId = ctrl->getId();
+										hitArea = area;
+										hitCtrl = ctrl;
+										if (type == UIControl::eSlider)
+											m_bMouseHoverHorizontalList = true;
+									}
+								}
+							}
+
+							if (hitControlId >= 0 && pScene->getControlFocus() != hitControlId)
+							{
+								// During direct editing, don't let hover move focus
+								// away to other TextInputs (e.g. sign lines).
+								if (hitCtrl && hitCtrl->getControlType() == UIControl::eTextInput
+									&& pScene->isDirectEditBlocking())
+								{
+									// Skip — keep focus on the actively-edited input
+								}
+								else
+								{
+									pScene->SetFocusToElement(hitControlId);
+									// TextInput: SetFocusToElement triggers ChangeState which
+									// shows the caret. Hide it immediately — the render pass
+									// happens after both tickInput and scene tick, so no flicker.
+									if (hitCtrl && hitCtrl->getControlType() == UIControl::eTextInput)
+									{
+										static_cast<UIControl_TextInput*>(hitCtrl)->setCaretVisible(false);
+									}
+								}
+							}
+						}
+					}
+
 					bool leftPressed = g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_LEFT);
 					bool leftDown = leftPressed || g_KBMInput.IsMouseButtonDown(KeyboardMouseInput::MOUSE_LEFT);
 
@@ -890,13 +1020,52 @@ void UIController::tickInput()
 						vector<UIControl *> *controls = pScene->GetControls();
 						if (controls)
 						{
+							// Set Iggy dispatch focus for TextInput on click (not hover)
+							// so ACTION_MENU_OK targets the correct text field.
+							for (size_t i = 0; i < controls->size(); ++i)
+							{
+								UIControl *ctrl = (*controls)[i];
+								if (!ctrl || ctrl->getControlType() != UIControl::eTextInput || !ctrl->getVisible())
+									continue;
+								if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+									continue;
+								ctrl->UpdateControl();
+								S32 cx = ctrl->getXPos() + panelOffsetX;
+								S32 cy = ctrl->getYPos() + panelOffsetY;
+								S32 cw = ctrl->getWidth();
+								S32 ch = ctrl->getHeight();
+								if (cw > 0 && ch > 0 &&
+									sceneMouseX >= cx && sceneMouseX <= cx + cw &&
+									sceneMouseY >= cy && sceneMouseY <= cy + ch)
+								{
+									Iggy *movie = pScene->getMovie();
+									IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
+									IggyFocusableObject focusables[64];
+									S32 numFocusables = 0;
+									IggyPlayerGetFocusableObjects(movie, &currentFocus, focusables, 64, &numFocusables);
+									for (S32 fi = 0; fi < numFocusables && fi < 64; ++fi)
+									{
+										if (sceneMouseX >= focusables[fi].x0 && sceneMouseX <= focusables[fi].x1 &&
+											sceneMouseY >= focusables[fi].y0 && sceneMouseY <= focusables[fi].y1)
+										{
+											IggyPlayerSetFocusRS(movie, focusables[fi].object, 0);
+											break;
+										}
+									}
+									break;
+								}
+							}
+
 							for (size_t i = 0; i < controls->size(); ++i)
 							{
 								UIControl *ctrl = (*controls)[i];
 								if (!ctrl || ctrl->getControlType() != UIControl::eSlider || !ctrl->getVisible())
 									continue;
 
-								UIControl_Slider *pSlider = (UIControl_Slider *)ctrl;
+								if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+									continue;
+
+								UIControl_Slider *pSlider = static_cast<UIControl_Slider *>(ctrl);
 								pSlider->UpdateControl();
 								S32 cx = pSlider->getXPos() + panelOffsetX;
 								S32 cy = pSlider->getYPos() + panelOffsetY;
@@ -925,7 +1094,7 @@ void UIController::tickInput()
 							S32 sliderWidth = pSlider->GetRealWidth();
 							if (sliderWidth > 0)
 							{
-								float fNewSliderPos = (sceneMouseX - (float)sliderX) / (float)sliderWidth;
+								float fNewSliderPos = (sceneMouseX - static_cast<float>(sliderX)) / static_cast<float>(sliderWidth);
 								if (fNewSliderPos < 0.0f) fNewSliderPos = 0.0f;
 								if (fNewSliderPos > 1.0f) fNewSliderPos = 1.0f;
 								pSlider->SetSliderTouchPos(fNewSliderPos);
@@ -942,6 +1111,12 @@ void UIController::tickInput()
 						m_mouseDraggingSliderScene = eUIScene_COUNT;
 						m_mouseDraggingSliderId = -1;
 					}
+
+					// Let the scene handle mouse clicks for custom navigation (e.g. crafting slots)
+					if (leftPressed && m_mouseDraggingSliderId < 0)
+					{
+						m_mouseClickConsumedByScene = pScene->handleMouseClick(sceneMouseX, sceneMouseY);
+					}
 				}
 			}
 #endif
@@ -1006,7 +1181,7 @@ void UIController::handleInput()
 
 		if(ProfileManager.GetLockedProfile() >= 0 && !InputManager.IsPadLocked( ProfileManager.GetLockedProfile() ) && firstUnfocussedUnhandledPad >= 0)
 		{
-			ProfileManager.RequestSignInUI(false, false, false, false, true, NULL, NULL, firstUnfocussedUnhandledPad );
+			ProfileManager.RequestSignInUI(false, false, false, false, true, nullptr, nullptr, firstUnfocussedUnhandledPad );
 		}
 	}
 #endif
@@ -1033,8 +1208,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		if((m_bTouchscreenPressed==false) && pTouchData->reportNum==1)
 		{
 			// no active touch? clear active and highlighted touch UI elements
-			m_ActiveUIElement = NULL;
-			m_HighlightedUIElement = NULL;
+			m_ActiveUIElement = nullptr;
+			m_HighlightedUIElement = nullptr;
 
 			// fullscreen first
 			UIScene *pScene=m_groups[(int)eUIGroup_Fullscreen]->getCurrentScene();
@@ -1206,7 +1381,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 
 		if ((key == ACTION_MENU_OK || key == ACTION_MENU_A) && !g_KBMInput.IsMouseGrabbed())
 		{
-			if (m_mouseDraggingSliderId < 0)
+			if (m_mouseDraggingSliderId < 0 && !m_mouseClickConsumedByScene)
 			{
 				if (g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_LEFT))  { pressed = true; down = true; }
 				if (g_KBMInput.IsMouseButtonReleased(KeyboardMouseInput::MOUSE_LEFT)) { released = true; down = false; }
@@ -1214,6 +1389,14 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 			}
 		}
 
+		// Right click → ACTION_MENU_X (pick up half stack in inventory)
+		if (key == ACTION_MENU_X && !g_KBMInput.IsMouseGrabbed())
+		{
+			if (g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_RIGHT))  { pressed = true; down = true; }
+			if (g_KBMInput.IsMouseButtonReleased(KeyboardMouseInput::MOUSE_RIGHT)) { released = true; down = false; }
+			if (!pressed && !released && g_KBMInput.IsMouseButtonDown(KeyboardMouseInput::MOUSE_RIGHT)) { down = true; }
+		}
+
 		// Scroll wheel for list scrolling — only consume the wheel value when the
 		// action key actually matches, so the other direction isn't lost.
 		if (!g_KBMInput.IsMouseGrabbed() && (key == ACTION_MENU_OTHER_STICK_UP || key == ACTION_MENU_OTHER_STICK_DOWN))
@@ -1231,6 +1414,16 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 				pressed = true;
 				down = true;
 			}
+
+			// Remap scroll wheel to navigation actions. Use LEFT/RIGHT when
+			// hovering a horizontal list (e.g. TexturePackList), UP/DOWN otherwise.
+			if (pressed && g_KBMInput.IsKBMActive())
+			{
+				if (m_bMouseHoverHorizontalList)
+					key = (key == ACTION_MENU_OTHER_STICK_UP) ? ACTION_MENU_LEFT : ACTION_MENU_RIGHT;
+				else
+					key = (key == ACTION_MENU_OTHER_STICK_UP) ? ACTION_MENU_UP : ACTION_MENU_DOWN;
+			}
 		}
 	}
 #endif
@@ -1297,8 +1490,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		//!(app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_ToggleFont)) &&
 		key == ACTION_MENU_STICK_PRESS)
 	{
-		__int64 totalStatic = 0;
-		__int64 totalDynamic = 0;
+		int64_t totalStatic = 0;
+		int64_t totalDynamic = 0;
 		app.DebugPrintf(app.USER_SR, "********************************\n");
 		app.DebugPrintf(app.USER_SR, "BEGIN TOTAL SWF MEMORY USAGE\n\n");
 		for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
@@ -1307,8 +1500,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		}
 		for(unsigned int i = 0; i < eLibrary_Count; ++i)
 		{
-			__int64 libraryStatic = 0;
-			__int64 libraryDynamic = 0;
+			int64_t libraryStatic = 0;
+			int64_t libraryDynamic = 0;
 
 			if(m_iggyLibraries[i] != IGGY_INVALID_LIBRARY)
 			{
@@ -1316,7 +1509,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 				IggyMemoryUseInfo memoryInfo;
 				rrbool res;
 				int iteration = 0;
-				while(res = IggyDebugGetMemoryUseInfo ( NULL ,
+				while(res = IggyDebugGetMemoryUseInfo ( nullptr ,
 					m_iggyLibraries[i] ,
 					"" ,
 					0 ,
@@ -1347,7 +1540,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 			bool handled = false;
 
 			// Send the key to the fullscreen group first
-			m_groups[(int)eUIGroup_Fullscreen]->handleInput(iPad, key, repeat, pressed, released, handled);
+			m_groups[static_cast<int>(eUIGroup_Fullscreen)]->handleInput(iPad, key, repeat, pressed, released, handled);
 			if(!handled)
 			{
 				// If it's not been handled yet, then pass the event onto the players specific group
@@ -1358,9 +1551,9 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 
 rrbool RADLINK UIController::ExternalFunctionCallback( void * user_callback_data , Iggy * player , IggyExternalFunctionCallUTF16 * call)
 {
-	UIScene *scene = (UIScene *)IggyPlayerGetUserdata(player);
+	UIScene *scene = static_cast<UIScene *>(IggyPlayerGetUserdata(player));
 
-	if(scene != NULL)
+	if(scene != nullptr)
 	{
 		scene->externalCallback(call);
 	}
@@ -1422,73 +1615,48 @@ void UIController::renderScenes()
 
 void UIController::getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height)
 {
-	switch( viewport )
+	F32 originX, originY, viewW, viewH;
+	GetViewportRect(getScreenWidth(), getScreenHeight(), viewport, originX, originY, viewW, viewH);
+
+	if(viewport == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 	{
-	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
-		width = (S32)(getScreenWidth());
-		height = (S32)(getScreenHeight());
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		width = (S32)(getScreenWidth() / 2);
-		height = (S32)(getScreenHeight() / 2);
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		width = (S32)(getScreenWidth() / 2);
-		height = (S32)(getScreenHeight() / 2);
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		width = (S32)(getScreenWidth() / 2);
-		height = (S32)(getScreenHeight() / 2);
-		break;
+		S32 offsetX, offsetY;
+		Fit16x9(viewW, viewH, width, height, offsetX, offsetY);
+	}
+	else
+	{
+		// Split-screen: use raw viewport dims — the SWF tiling code handles non-16:9
+		width = static_cast<S32>(viewW);
+		height = static_cast<S32>(viewH);
 	}
 }
 
 void UIController::setupRenderPosition(C4JRender::eViewportType viewport)
 {
-	if(m_bCustomRenderPosition || m_currentRenderViewport != viewport)
+	m_currentRenderViewport = viewport;
+	m_bCustomRenderPosition = false;
+
+	F32 vpOriginX, vpOriginY, vpW, vpH;
+	GetViewportRect(getScreenWidth(), getScreenHeight(), viewport, vpOriginX, vpOriginY, vpW, vpH);
+
+	S32 xPos, yPos;
+	if(viewport == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 	{
-		m_currentRenderViewport = viewport;
-		m_bCustomRenderPosition = false;
-		S32 xPos = 0;
-		S32 yPos = 0;
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			xPos = (S32)(getScreenWidth() / 4);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			xPos = (S32)(getScreenWidth() / 4);
-			yPos = (S32)(getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-			yPos = (S32)(getScreenHeight() / 4);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			xPos = (S32)(getScreenWidth() / 2);
-			yPos = (S32)(getScreenHeight() / 4);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(getScreenWidth() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(getScreenWidth() / 2);
-			yPos = (S32)(getScreenHeight() / 2);
-			break;
-		}
-		m_tileOriginX = xPos;
-		m_tileOriginY = yPos;
-		setTileOrigin(xPos, yPos);
+		S32 fitW, fitH, fitOffsetX, fitOffsetY;
+		Fit16x9(vpW, vpH, fitW, fitH, fitOffsetX, fitOffsetY);
+		xPos = static_cast<S32>(vpOriginX) + fitOffsetX;
+		yPos = static_cast<S32>(vpOriginY) + fitOffsetY;
+	}
+	else
+	{
+		// Split-screen: position at viewport origin, no 16:9 fitting
+		xPos = static_cast<S32>(vpOriginX);
+		yPos = static_cast<S32>(vpOriginY);
 	}
+
+	m_tileOriginX = xPos;
+	m_tileOriginY = yPos;
+	setTileOrigin(xPos, yPos);
 }
 
 void UIController::setupRenderPosition(S32 xOrigin, S32 yOrigin)
@@ -1547,8 +1715,8 @@ void UIController::setupCustomDrawMatrices(UIScene *scene, CustomDrawData *custo
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// Clear just the region required for this control.
-	float sceneWidth = (float)scene->getRenderWidth();
-	float sceneHeight = (float)scene->getRenderHeight();
+	float sceneWidth = static_cast<float>(scene->getRenderWidth());
+	float sceneHeight = static_cast<float>(scene->getRenderHeight());
 
 	LONG left, right, top, bottom;
 #ifdef __PS3__
@@ -1576,10 +1744,10 @@ void UIController::setupCustomDrawMatrices(UIScene *scene, CustomDrawData *custo
 	if(!m_bScreenWidthSetup)
 	{
 		Minecraft *pMinecraft=Minecraft::GetInstance();
-		if(pMinecraft != NULL)
+		if(pMinecraft != nullptr)
 		{
-			m_fScreenWidth=(float)pMinecraft->width_phys;
-			m_fScreenHeight=(float)pMinecraft->height_phys;
+			m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+			m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
 			m_bScreenWidthSetup = true;
 		}
 	}
@@ -1623,9 +1791,9 @@ void UIController::endCustomDrawGameStateAndMatrices()
 
 void RADLINK UIController::CustomDrawCallback(void *user_callback_data, Iggy *player, IggyCustomDrawCallbackRegion *region)
 {
-	UIScene *scene = (UIScene *)IggyPlayerGetUserdata(player);
+	UIScene *scene = static_cast<UIScene *>(IggyPlayerGetUserdata(player));
 
-	if(scene != NULL)
+	if(scene != nullptr)
 	{
 		scene->customDraw(region);
 	}
@@ -1637,7 +1805,7 @@ void RADLINK UIController::CustomDrawCallback(void *user_callback_data, Iggy *pl
 //width - Input value: optional number of pixels wide specified from AS3, or -1 if not defined. Output value: the number of pixels wide to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is.
 //height - Input value: optional number of pixels high specified from AS3, or -1 if not defined. Output value: the number of pixels high to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is.
 //destroy_callback_data - Optional additional output value you can set; the value will be passed along to the corresponding Iggy_TextureSubstitutionDestroyCallback (e.g. you can store the pointer to your own internal structure here).
-//return - A platform-independent wrapped texture handle provided by GDraw, or NULL (NULL with throw an ActionScript 3 ArgumentError that the Flash developer can catch) Use by calling IggySetTextureSubstitutionCallbacks.
+//return - A platform-independent wrapped texture handle provided by GDraw, or nullptr (nullptr with throw an ActionScript 3 ArgumentError that the Flash developer can catch) Use by calling IggySetTextureSubstitutionCallbacks.
 //
 //Discussion
 //
@@ -1652,7 +1820,7 @@ GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void *
 		app.DebugPrintf("Found substitution texture %ls, with %d bytes\n", texture_name,it->second.length);
 
 		BufferedImage image(it->second.data, it->second.length);
-		if( image.getData() != NULL )
+		if( image.getData() != nullptr )
 		{
 			image.preMultiplyAlpha();
 			Textures *t = Minecraft::GetInstance()->textures;
@@ -1660,28 +1828,38 @@ GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void *
 
 			// 4J Stu - All our flash controls that allow replacing textures use a special 64x64 symbol
 			// Force this size here so that our images don't get scaled wildly
-	#if (defined __ORBIS__ || defined _DURANGO || defined _WINDOWS64 )
+	#if (defined __ORBIS__ || defined _DURANGO )
 			*width = 96;
 			*height = 96;
 	#else
 			*width = 64;
 			*height = 64;
+	#endif
 
+	#if defined _WINDOWS64
+            // Only set the size to 96x96 for 1080p on Windows
+            UIScene *scene = uiController->GetTopScene(0);
+            if (scene->getSceneResolution() == UIScene::eSceneResolution_1080)
+            {
+                *width = 96;
+                *height = 96;
+			}
 	#endif
+
 			*destroy_callback_data = (void *)id;
 
-			app.DebugPrintf("Found substitution texture %ls (%d) - %dx%d\n", (wchar_t *)texture_name, id, image.getWidth(), image.getHeight());
+			app.DebugPrintf("Found substitution texture %ls (%d) - %dx%d\n", static_cast<wchar_t *>(texture_name), id, image.getWidth(), image.getHeight());
 			return ui.getSubstitutionTexture(id);
 		}
 		else
 		{
-			return NULL;
+			return nullptr;
 		}
 	}
 	else
 	{
-		app.DebugPrintf("Could not find substitution texture %ls\n", (wchar_t *)texture_name);
-		return NULL;
+		app.DebugPrintf("Could not find substitution texture %ls\n", static_cast<wchar_t *>(texture_name));
+		return nullptr;
 	}
 }
 
@@ -1691,13 +1869,16 @@ void RADLINK UIController::TextureSubstitutionDestroyCallback ( void * user_call
 {
 	// Orbis complains about casting a pointer to an int
 	LONGLONG llVal=(LONGLONG)destroy_callback_data;
-	int id=(int)llVal;
+	int id=static_cast<int>(llVal);
 	app.DebugPrintf("Destroying iggy texture %d\n", id);
 
 	ui.destroySubstitutionTexture(user_callback_data, handle);
 
-	Textures *t = Minecraft::GetInstance()->textures;
-	t->releaseTexture( id );
+	Minecraft* mc = Minecraft::GetInstance();
+	if (mc && mc->textures)
+	{
+		mc->textures->releaseTexture( id );
+	}
 }
 
 void UIController::registerSubstitutionTexture(const wstring &textureName, PBYTE pbData, DWORD dwLength)
@@ -1723,6 +1904,7 @@ void UIController::unregisterSubstitutionTexture(const wstring &textureName, boo
 bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUILayer layer, EUIGroup group)
 {
 	static bool bSeenUpdateTextThisSession = false;
+	#if 0 // Disable since we don't use this
 	// If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now
 	// display this message the first 3 times
 	if((scene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
@@ -1730,6 +1912,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 		scene=eUIScene_NewUpdateMessage;
 		bSeenUpdateTextThisSession=true;
 	}
+	#endif
 
 	// if you're trying to navigate to the inventory,the crafting, pause or game info or any of the trigger scenes and there's already a menu up (because you were pressing a few buttons at the same time) then ignore the navigate
 	if(GetMenuDisplayed(iPad))
@@ -1791,7 +1974,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 			if( ( iPad != 255 ) && ( iPad >= 0 ) )
 			{
 				menuDisplayedPad = iPad;
-				group = (EUIGroup)(iPad+1);
+				group = static_cast<EUIGroup>(iPad + 1);
 			}
 			else group = eUIGroup_Fullscreen;
 		}
@@ -1806,7 +1989,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 
 	EnterCriticalSection(&m_navigationLock);
 	SetMenuDisplayed(menuDisplayedPad,true);
-	bool success = m_groups[(int)group]->NavigateToScene(iPad, scene, initData, layer);
+	bool success = m_groups[static_cast<int>(group)]->NavigateToScene(iPad, scene, initData, layer);
 	if(success && group == eUIGroup_Fullscreen) setFullscreenMenuDisplayed(true);
 	LeaveCriticalSection(&m_navigationLock);
 
@@ -1821,18 +2004,18 @@ bool UIController::NavigateBack(int iPad, bool forceUsePad, EUIScene eScene, EUI
 	bool navComplete = false;
 	if( app.GetGameStarted() )
 	{
-		bool navComplete = m_groups[(int)eUIGroup_Fullscreen]->NavigateBack(iPad, eScene, eLayer);
+		bool navComplete = m_groups[static_cast<int>(eUIGroup_Fullscreen)]->NavigateBack(iPad, eScene, eLayer);
 
 		if(!navComplete && ( iPad != 255 ) && ( iPad >= 0 ) )
 		{
-			EUIGroup group = (EUIGroup)(iPad+1);
-			navComplete = m_groups[(int)group]->NavigateBack(iPad, eScene, eLayer);
-			if(!m_groups[(int)group]->GetMenuDisplayed())SetMenuDisplayed(iPad,false);
+			EUIGroup group = static_cast<EUIGroup>(iPad + 1);
+			navComplete = m_groups[static_cast<int>(group)]->NavigateBack(iPad, eScene, eLayer);
+			if(!m_groups[static_cast<int>(group)]->GetMenuDisplayed())SetMenuDisplayed(iPad,false);
 		}
 		// 4J-PB - autosave in fullscreen doesn't clear the menuDisplayed flag
 		else
 		{
-			if(!m_groups[(int)eUIGroup_Fullscreen]->GetMenuDisplayed())
+			if(!m_groups[static_cast<int>(eUIGroup_Fullscreen)]->GetMenuDisplayed())
 			{
 				setFullscreenMenuDisplayed(false);
 				for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
@@ -1844,8 +2027,8 @@ bool UIController::NavigateBack(int iPad, bool forceUsePad, EUIScene eScene, EUI
 	}
 	else
 	{
-		navComplete = m_groups[(int)eUIGroup_Fullscreen]->NavigateBack(iPad, eScene, eLayer);
-		if(!m_groups[(int)eUIGroup_Fullscreen]->GetMenuDisplayed()) SetMenuDisplayed(XUSER_INDEX_ANY,false);
+		navComplete = m_groups[static_cast<int>(eUIGroup_Fullscreen)]->NavigateBack(iPad, eScene, eLayer);
+		if(!m_groups[static_cast<int>(eUIGroup_Fullscreen)]->GetMenuDisplayed()) SetMenuDisplayed(XUSER_INDEX_ANY,false);
 	}
 	return navComplete;
 }
@@ -1866,11 +2049,11 @@ void UIController::NavigateToHomeMenu()
 	TexturePack *pTexPack=Minecraft::GetInstance()->skins->getSelected();
 
 
-	DLCTexturePack *pDLCTexPack=NULL;
+	DLCTexturePack *pDLCTexPack=nullptr;
 	if(pTexPack->hasAudio())
 	{
 		// get the dlc texture pack, and store it
-		pDLCTexPack=(DLCTexturePack *)pTexPack;
+		pDLCTexPack=static_cast<DLCTexturePack *>(pTexPack);
 	}
 
 	// change to the default texture pack
@@ -1887,11 +2070,11 @@ void UIController::NavigateToHomeMenu()
 			eStream_CD_1);
 		pMinecraft->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1);
 
-		// 		if(pDLCTexPack->m_pStreamedWaveBank!=NULL)
+		// 		if(pDLCTexPack->m_pStreamedWaveBank!=nullptr)
 		// 		{
 		// 			pDLCTexPack->m_pStreamedWaveBank->Destroy();
 		// 		}
-		// 		if(pDLCTexPack->m_pSoundBank!=NULL)
+		// 		if(pDLCTexPack->m_pSoundBank!=nullptr)
 		// 		{
 		// 			pDLCTexPack->m_pSoundBank->Destroy();
 		// 		}
@@ -1925,7 +2108,7 @@ UIScene *UIController::GetTopScene(int iPad, EUILayer layer, EUIGroup group)
 			// If the game isn't running treat as user 0, otherwise map index directly from pad
 			if( ( iPad != 255 ) && ( iPad >= 0 ) )
 			{
-				group = (EUIGroup)(iPad+1);
+				group = static_cast<EUIGroup>(iPad + 1);
 			}
 			else group = eUIGroup_Fullscreen;
 		}
@@ -1935,7 +2118,7 @@ UIScene *UIController::GetTopScene(int iPad, EUILayer layer, EUIGroup group)
 			group = eUIGroup_Fullscreen;
 		}
 	}
-	return m_groups[(int)group]->GetTopScene(layer);
+	return m_groups[static_cast<int>(group)]->GetTopScene(layer);
 }
 
 size_t UIController::RegisterForCallbackId(UIScene *scene)
@@ -1962,7 +2145,7 @@ void UIController::UnregisterCallbackId(size_t id)
 
 UIScene *UIController::GetSceneFromCallbackId(size_t id)
 {
-	UIScene *scene = NULL;
+	UIScene *scene = nullptr;
     auto it = m_registeredCallbackScenes.find(id);
     if(it != m_registeredCallbackScenes.end() )
 	{
@@ -1983,7 +2166,7 @@ void UIController::LeaveCallbackIdCriticalSection()
 
 void UIController::CloseAllPlayersScenes()
 {
-	m_groups[(int)eUIGroup_Fullscreen]->getTooltips()->SetTooltips(-1);
+	m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getTooltips()->SetTooltips(-1);
 	for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
 	{
 		//m_bCloseAllScenes[i] = true;
@@ -2006,7 +2189,7 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad)
 	if( app.GetGameStarted() || forceIPad )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2014,22 +2197,22 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad)
 		group = eUIGroup_Fullscreen;
 	}
 
-	m_groups[(int)group]->closeAllScenes();
-	m_groups[(int)group]->getTooltips()->SetTooltips(-1);
+	m_groups[static_cast<int>(group)]->closeAllScenes();
+	m_groups[static_cast<int>(group)]->getTooltips()->SetTooltips(-1);
 
 	// This should cause the popup to dissappear
 	TutorialPopupInfo popupInfo;
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(&popupInfo);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->SetTutorialDescription(&popupInfo);
 
 	if(group==eUIGroup_Fullscreen) setFullscreenMenuDisplayed(false);
 
-	SetMenuDisplayed((group == eUIGroup_Fullscreen ? XUSER_INDEX_ANY : iPad), m_groups[(int)group]->GetMenuDisplayed());
+	SetMenuDisplayed((group == eUIGroup_Fullscreen ? XUSER_INDEX_ANY : iPad), m_groups[static_cast<int>(group)]->GetMenuDisplayed());
 }
 
 void UIController::setFullscreenMenuDisplayed(bool displayed)
 {
 	// Show/hide the tooltips for the fullscreen group
-	m_groups[(int)eUIGroup_Fullscreen]->showComponent(ProfileManager.GetPrimaryPad(),eUIComponent_Tooltips,eUILayer_Tooltips,displayed);
+	m_groups[static_cast<int>(eUIGroup_Fullscreen)]->showComponent(ProfileManager.GetPrimaryPad(),eUIComponent_Tooltips,eUILayer_Tooltips,displayed);
 
 	// Show/hide tooltips for the other layers
 	for(unsigned int i = (eUIGroup_Fullscreen+1); i < eUIGroup_COUNT; ++i)
@@ -2044,14 +2227,14 @@ bool UIController::IsPauseMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsPauseMenuDisplayed();
+	return m_groups[static_cast<int>(group)]->IsPauseMenuDisplayed();
 }
 
 bool UIController::IsContainerMenuDisplayed(int iPad)
@@ -2060,14 +2243,14 @@ bool UIController::IsContainerMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsContainerMenuDisplayed();
+	return m_groups[static_cast<int>(group)]->IsContainerMenuDisplayed();
 }
 
 bool UIController::IsIgnorePlayerJoinMenuDisplayed(int iPad)
@@ -2076,14 +2259,14 @@ bool UIController::IsIgnorePlayerJoinMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsIgnorePlayerJoinMenuDisplayed();
+	return m_groups[static_cast<int>(group)]->IsIgnorePlayerJoinMenuDisplayed();
 }
 
 bool UIController::IsIgnoreAutosaveMenuDisplayed(int iPad)
@@ -2092,14 +2275,14 @@ bool UIController::IsIgnoreAutosaveMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)eUIGroup_Fullscreen]->IsIgnoreAutosaveMenuDisplayed() || (group != eUIGroup_Fullscreen && m_groups[(int)group]->IsIgnoreAutosaveMenuDisplayed());
+	return m_groups[static_cast<int>(eUIGroup_Fullscreen)]->IsIgnoreAutosaveMenuDisplayed() || (group != eUIGroup_Fullscreen && m_groups[static_cast<int>(group)]->IsIgnoreAutosaveMenuDisplayed());
 }
 
 void UIController::SetIgnoreAutosaveMenuDisplayed(int iPad, bool displayed)
@@ -2113,14 +2296,14 @@ bool UIController::IsSceneInStack(int iPad, EUIScene eScene)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsSceneInStack(eScene);
+	return m_groups[static_cast<int>(group)]->IsSceneInStack(eScene);
 }
 
 bool UIController::GetMenuDisplayed(int iPad)
@@ -2201,14 +2384,14 @@ void UIController::SetTooltipText( unsigned int iPad, unsigned int tooltip, int
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetTooltipText(tooltip, iTextID);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->SetTooltipText(tooltip, iTextID);
 }
 
 void UIController::SetEnableTooltips( unsigned int iPad, BOOL bVal )
@@ -2217,14 +2400,14 @@ void UIController::SetEnableTooltips( unsigned int iPad, BOOL bVal )
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetEnableTooltips(bVal);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->SetEnableTooltips(bVal);
 }
 
 void UIController::ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show )
@@ -2233,14 +2416,14 @@ void UIController::ShowTooltip( unsigned int iPad, unsigned int tooltip, bool sh
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->ShowTooltip(tooltip,show);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->ShowTooltip(tooltip,show);
 }
 
 void UIController::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int iY, int iLT, int iRT, int iLB, int iRB, int iLS, int iRS, int iBack, bool forceUpdate)
@@ -2262,14 +2445,14 @@ void UIController::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int i
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetTooltips(iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS, iBack, forceUpdate);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->SetTooltips(iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS, iBack, forceUpdate);
 }
 
 void UIController::EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable )
@@ -2278,14 +2461,14 @@ void UIController::EnableTooltip( unsigned int iPad, unsigned int tooltip, bool
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->EnableTooltip(tooltip,enable);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->EnableTooltip(tooltip,enable);
 }
 
 void UIController::RefreshTooltips(unsigned int iPad)
@@ -2304,7 +2487,7 @@ void UIController::AnimateKeyPress(int iPad, int iAction, bool bRepeat, bool bPr
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2312,7 +2495,7 @@ void UIController::AnimateKeyPress(int iPad, int iAction, bool bRepeat, bool bPr
 		group = eUIGroup_Fullscreen;
 	}
 	bool handled = false;
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->handleInput(iPad, iAction, bRepeat, bPressed, bReleased, handled);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->handleInput(iPad, iAction, bRepeat, bPressed, bReleased, handled);
 }
 
 void UIController::OverrideSFX(int iPad, int iAction,bool bVal)
@@ -2322,7 +2505,7 @@ void UIController::OverrideSFX(int iPad, int iAction,bool bVal)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2330,19 +2513,25 @@ void UIController::OverrideSFX(int iPad, int iAction,bool bVal)
 		group = eUIGroup_Fullscreen;
 	}
 	bool handled = false;
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->overrideSFX(iPad, iAction,bVal);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->overrideSFX(iPad, iAction,bVal);
 }
 
 void UIController::PlayUISFX(ESoundEffect eSound)
 {
-	__uint64 time = System::currentTimeMillis();
+	uint64_t time = System::currentTimeMillis();
 
 	// Don't play multiple SFX on the same tick
 	// (prevents horrible sounds when programmatically setting multiple checkboxes)
 	if (time - m_lastUiSfx < 10) { return; }
 	m_lastUiSfx = time;
 
-	Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,1.0f);
+	float pitch = 1.0f;
+	if (eSound == eSFX_Focus)
+	{
+		pitch += (m_randomDistribution(m_randomGenerator) - 0.5f) / 10;
+	}
+
+	Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,pitch);
 }
 
 void UIController::DisplayGamertag(unsigned int iPad, bool show)
@@ -2352,13 +2541,13 @@ void UIController::DisplayGamertag(unsigned int iPad, bool show)
 	{
 		show = false;
 	}
-	EUIGroup group = (EUIGroup)(iPad+1);
-	if(m_groups[(int)group]->getHUD()) m_groups[(int)group]->getHUD()->ShowDisplayName(show);
+	EUIGroup group = static_cast<EUIGroup>(iPad + 1);
+	if(m_groups[static_cast<int>(group)]->getHUD()) m_groups[static_cast<int>(group)]->getHUD()->ShowDisplayName(show);
 
 	// Update TutorialPopup in Splitscreen if no container is displayed (to make sure the Popup does not overlap with the Gamertag!)
-	if(app.GetLocalPlayerCount() > 1 && m_groups[(int)group]->getTutorialPopup() && !m_groups[(int)group]->IsContainerMenuDisplayed())
+	if(app.GetLocalPlayerCount() > 1 && m_groups[static_cast<int>(group)]->getTutorialPopup() && !m_groups[static_cast<int>(group)]->IsContainerMenuDisplayed())
 	{
-		m_groups[(int)group]->getTutorialPopup()->UpdateTutorialPopup();
+		m_groups[static_cast<int>(group)]->getTutorialPopup()->UpdateTutorialPopup();
 	}
 }
 
@@ -2369,7 +2558,7 @@ void UIController::SetSelectedItem(unsigned int iPad, const wstring &name)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2377,7 +2566,7 @@ void UIController::SetSelectedItem(unsigned int iPad, const wstring &name)
 		group = eUIGroup_Fullscreen;
 	}
 	bool handled = false;
-	if(m_groups[(int)group]->getHUD()) m_groups[(int)group]->getHUD()->SetSelectedLabel(name);
+	if(m_groups[static_cast<int>(group)]->getHUD()) m_groups[static_cast<int>(group)]->getHUD()->SetSelectedLabel(name);
 }
 
 void UIController::UpdateSelectedItemPos(unsigned int iPad)
@@ -2430,10 +2619,10 @@ void UIController::HandleInventoryUpdated(int iPad)
 	EUIGroup group = eUIGroup_Fullscreen;
 	if( app.GetGameStarted() && ( iPad != 255 ) && ( iPad >= 0 ) )
 	{
-		group = (EUIGroup)(iPad+1);
+		group = static_cast<EUIGroup>(iPad + 1);
 	}
 
-	m_groups[group]->HandleMessage(eUIMessage_InventoryUpdated, NULL);
+	m_groups[group]->HandleMessage(eUIMessage_InventoryUpdated, nullptr);
 }
 
 void UIController::HandleGameTick()
@@ -2452,14 +2641,14 @@ void UIController::SetTutorial(int iPad, Tutorial *tutorial)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetTutorial(tutorial);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->SetTutorial(tutorial);
 }
 
 void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
@@ -2468,7 +2657,7 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2476,11 +2665,11 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
 		group = eUIGroup_Fullscreen;
 	}
 
-	if(m_groups[(int)group]->getTutorialPopup())
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup())
 	{
 		// tutorial popup needs to know if a container menu is being displayed
-		m_groups[(int)group]->getTutorialPopup()->SetContainerMenuVisible(m_groups[(int)group]->IsContainerMenuDisplayed());
-		m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(info);
+		m_groups[static_cast<int>(group)]->getTutorialPopup()->SetContainerMenuVisible(m_groups[static_cast<int>(group)]->IsContainerMenuDisplayed());
+		m_groups[static_cast<int>(group)]->getTutorialPopup()->SetTutorialDescription(info);
 	}
 }
 
@@ -2488,9 +2677,9 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
 void UIController::RemoveInteractSceneReference(int iPad, UIScene *scene)
 {
 	EUIGroup group;
-	if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+	if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 	else group = eUIGroup_Fullscreen;
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->RemoveInteractSceneReference(scene);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->RemoveInteractSceneReference(scene);
 }
 #endif
 
@@ -2500,14 +2689,14 @@ void UIController::SetTutorialVisible(int iPad, bool visible)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetVisible(visible);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->SetVisible(visible);
 }
 
 bool UIController::IsTutorialVisible(int iPad)
@@ -2516,7 +2705,7 @@ bool UIController::IsTutorialVisible(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2524,7 +2713,7 @@ bool UIController::IsTutorialVisible(int iPad)
 		group = eUIGroup_Fullscreen;
 	}
 	bool visible = false;
-	if(m_groups[(int)group]->getTutorialPopup()) visible = m_groups[(int)group]->getTutorialPopup()->IsVisible();
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) visible = m_groups[static_cast<int>(group)]->getTutorialPopup()->IsVisible();
 	return visible;
 }
 
@@ -2534,7 +2723,7 @@ void UIController::UpdatePlayerBasePositions()
 
 	for( BYTE idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 	{
-		if(pMinecraft->localplayers[idx] != NULL)
+		if(pMinecraft->localplayers[idx] != nullptr)
 		{
 			if(pMinecraft->localplayers[idx]->m_iScreenSection==C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 			{
@@ -2544,7 +2733,7 @@ void UIController::UpdatePlayerBasePositions()
 			{
 				DisplayGamertag(idx,true);
 			}
-			m_groups[idx+1]->SetViewportType((C4JRender::eViewportType)pMinecraft->localplayers[idx]->m_iScreenSection);
+			m_groups[idx+1]->SetViewportType(static_cast<C4JRender::eViewportType>(pMinecraft->localplayers[idx]->m_iScreenSection));
 		}
 		else
 		{
@@ -2577,7 +2766,7 @@ void UIController::ShowOtherPlayersBaseScene(unsigned int iPad, bool show)
 
 void UIController::ShowTrialTimer(bool show)
 {
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showTrialTimer(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showTrialTimer(show);
 }
 
 void UIController::SetTrialTimerLimitSecs(unsigned int uiSeconds)
@@ -2589,7 +2778,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 {
 	WCHAR wcTime[20];
 
-	DWORD dwTimeTicks=(DWORD)app.getTrialTimer();
+	DWORD dwTimeTicks=static_cast<DWORD>(app.getTrialTimer());
 
 	if(dwTimeTicks>m_dwTrialTimerLimitSecs)
 	{
@@ -2608,11 +2797,11 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 		int iMins=dwTimeTicks/60;
 		int iSeconds=dwTimeTicks%60;
 		swprintf( wcTime, 20, L"%d:%02d",iMins,iSeconds);
-		if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcTime);
+		if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->setTrialTimer(wcTime);
 	}
 	else
 	{
-		if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(L"");
+		if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->setTrialTimer(L"");
 	}
 
 	// are we out of time?
@@ -2622,7 +2811,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 		// bring up the pause menu to stop the trial over message box being called again?
 		if(!ui.GetMenuDisplayed( iPad ) )
 		{
-			ui.NavigateToScene(iPad, eUIScene_PauseMenu, NULL, eUILayer_Scene);
+			ui.NavigateToScene(iPad, eUIScene_PauseMenu, nullptr, eUILayer_Scene);
 
 			app.SetAction(iPad,eAppAction_TrialOver);
 		}
@@ -2631,7 +2820,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 
 void UIController::ReduceTrialTimerValue()
 {
-	DWORD dwTimeTicks=(int)app.getTrialTimer();
+	DWORD dwTimeTicks=static_cast<int>(app.getTrialTimer());
 
 	if(dwTimeTicks>m_dwTrialTimerLimitSecs)
 	{
@@ -2643,7 +2832,7 @@ void UIController::ReduceTrialTimerValue()
 
 void UIController::ShowAutosaveCountdownTimer(bool show)
 {
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showTrialTimer(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showTrialTimer(show);
 }
 
 void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
@@ -2651,7 +2840,7 @@ void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
 #if !(defined(_XBOX_ONE) || defined(__ORBIS__))
 	WCHAR wcAutosaveCountdown[100];
 	swprintf( wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN),uiSeconds);
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown);
 #endif
 }
 
@@ -2668,12 +2857,12 @@ void UIController::ShowSavingMessage(unsigned int iPad, C4JStorage::ESavingMessa
 		show = true;
 		break;
 	}
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showSaveIcon(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showSaveIcon(show);
 }
 
 void UIController::ShowPlayerDisplayname(bool show)
 {
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showPlayerDisplayName(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showPlayerDisplayName(show);
 }
 
 void UIController::SetWinUserIndex(unsigned int iPad)
@@ -2692,12 +2881,12 @@ void UIController::ShowUIDebugConsole(bool show)
 
 	if(show)
 	{
-		m_uiDebugConsole = (UIComponent_DebugUIConsole *)m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIConsole, eUILayer_Debug);
+		m_uiDebugConsole = static_cast<UIComponent_DebugUIConsole *>(m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIConsole, eUILayer_Debug));
 	}
 	else
 	{
 		m_groups[eUIGroup_Fullscreen]->removeComponent(eUIComponent_DebugUIConsole, eUILayer_Debug);
-		m_uiDebugConsole = NULL;
+		m_uiDebugConsole = nullptr;
 	}
 #endif
 }
@@ -2708,12 +2897,12 @@ void UIController::ShowUIDebugMarketingGuide(bool show)
 
 	if(show)
 	{
-		m_uiDebugMarketingGuide = (UIComponent_DebugUIMarketingGuide *)m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIMarketingGuide, eUILayer_Debug);
+		m_uiDebugMarketingGuide = static_cast<UIComponent_DebugUIMarketingGuide *>(m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIMarketingGuide, eUILayer_Debug));
 	}
 	else
 	{
 		m_groups[eUIGroup_Fullscreen]->removeComponent(eUIComponent_DebugUIMarketingGuide, eUILayer_Debug);
-		m_uiDebugMarketingGuide = NULL;
+		m_uiDebugMarketingGuide = nullptr;
 	}
 #endif
 }
@@ -2731,13 +2920,13 @@ bool UIController::PressStartPlaying(unsigned int iPad)
 void UIController::ShowPressStart(unsigned int iPad)
 {
 	m_iPressStartQuadrantsMask|=1<<iPad;
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showPressStart(iPad, true);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showPressStart(iPad, true);
 }
 
 void UIController::HidePressStart()
 {
 	ClearPressStart();
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showPressStart(0, false);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showPressStart(0, false);
 }
 
 void UIController::ClearPressStart()
@@ -2800,7 +2989,7 @@ C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT ui
 	}
 }
 
-C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = NULL*/, LPVOID lpParam/* = NULL*/)
+C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = nullptr*/, LPVOID lpParam/* = nullptr*/)
 {
 	// Default title / messages
 	if (title == -1)
@@ -2832,7 +3021,7 @@ C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1
 #endif
 }
 
-C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = NULL*/, LPVOID lpParam/* = NULL*/)
+C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = nullptr*/, LPVOID lpParam/* = nullptr*/)
 {
 	// Default title / messages
 	if (title == -1)
@@ -2870,7 +3059,7 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT
 void UIController::setFontCachingCalculationBuffer(int length)
 {
 	/* 4J-JEV: As described in an email from Sean.
-	If your `optional_temp_buffer` is NULL, Iggy will allocate the temp
+	If your `optional_temp_buffer` is nullptr, Iggy will allocate the temp
 	buffer on the stack during Iggy draw calls. The size of the buffer it
 	will allocate is 16 bytes times `max_chars` in 32-bit, and 24 bytes
 	times `max_chars` in 64-bit. If the stack of the thread making the
@@ -2883,10 +3072,10 @@ void UIController::setFontCachingCalculationBuffer(int length)
 	static const int CHAR_SIZE = 16;
 #endif
 
-	if (m_tempBuffer != NULL) delete [] m_tempBuffer;
+	if (m_tempBuffer != nullptr) delete [] m_tempBuffer;
 	if (length<0)
 	{
-		if (m_defaultBuffer == NULL) m_defaultBuffer = new char[CHAR_SIZE*5000];
+		if (m_defaultBuffer == nullptr) m_defaultBuffer = new char[CHAR_SIZE*5000];
 		IggySetFontCachingCalculationBuffer(5000, m_defaultBuffer, CHAR_SIZE*5000);
 	}
 	else
@@ -2896,16 +3085,16 @@ void UIController::setFontCachingCalculationBuffer(int length)
 	}
 }
 
-// Returns the first scene of given type if it exists, NULL otherwise
+// Returns the first scene of given type if it exists, nullptr otherwise
 UIScene *UIController::FindScene(EUIScene sceneType)
 {
-	UIScene *pScene = NULL;
+	UIScene *pScene = nullptr;
 
 	for (int i = 0; i < eUIGroup_COUNT; i++)
 	{
 		pScene = m_groups[i]->FindScene(sceneType);
 #ifdef __PS3__
-		if (pScene != NULL) return pScene;
+		if (pScene != nullptr) return pScene;
 #else
 		if (pScene != nullptr) return pScene;
 #endif
@@ -3071,7 +3260,7 @@ bool UIController::TouchBoxHit(UIScene *pUIScene,S32 x, S32 y)
 	}
 
 	//app.DebugPrintf("MISS at x = %i y = %i\n", (int)x, (int)y);
-	m_HighlightedUIElement = NULL;
+	m_HighlightedUIElement = nullptr;
 	return false;
 }
 
diff --git a/Minecraft.Client/Common/UI/UIController.h b/Minecraft.Client/Common/UI/UIController.h
index 373d67b2..08a5ba08 100644
--- a/Minecraft.Client/Common/UI/UIController.h
+++ b/Minecraft.Client/Common/UI/UIController.h
@@ -3,6 +3,7 @@ using namespace std;
 #include "IUIController.h"
 #include "UIEnums.h"
 #include "UIGroup.h"
+#include <random>
 
 class UIAbstractBitmapFont;
 class UIBitmapFont;
@@ -15,7 +16,7 @@ class UIControl;
 class UIController : public IUIController
 {
 public:
-	static __int64 iggyAllocCount;
+	static int64_t iggyAllocCount;
 
 	// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
 	static CRITICAL_SECTION ms_reloadSkinCS;
@@ -29,7 +30,7 @@ private:
 	CRITICAL_SECTION m_navigationLock;
 
 	static const int UI_REPEAT_KEY_DELAY_MS = 300; // How long from press until the first repeat
-	static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats	
+	static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats
 	DWORD m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU+1];
 
 	float m_fScreenWidth;
@@ -49,7 +50,7 @@ private:
 		eFont_Korean,
 
 	};
-	
+
 	// 4J-JEV: It's important that currentFont == targetFont, unless updateCurrentLanguage is going to be called.
 	EFont m_eCurrentFont, m_eTargetFont;
 
@@ -63,6 +64,9 @@ private:
 	UITTFFont *m_mcTTFFont;
 	UIBitmapFont *m_moj7, *m_moj11;
 
+	std::mt19937 m_randomGenerator;
+	std::uniform_real_distribution<float> m_randomDistribution;
+
 public:
 	void setCleanupOnReload();
 	void updateCurrentFont();
@@ -72,7 +76,7 @@ private:
 	// 4J-PB - ui element type for PSVita touch control
 #ifdef __PSVITA__
 
-	typedef struct  
+	typedef struct
 	{
 		UIControl *pControl;
 		S32 x1,y1,x2,y2;
@@ -97,9 +101,8 @@ private:
 		eLibrary_Tooltips,
 		eLibrary_Default,
 
-#if ( defined(_WINDOWS64) )
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
+#if defined(_WINDOWS64)
+		// Non-HD skin libraries needed by 720p/480p scene SWFs.
 		eLibraryFallback_Platform,
 		eLibraryFallback_GraphicsDefault,
 		eLibraryFallback_GraphicsHUD,
@@ -112,7 +115,6 @@ private:
 		eLibraryFallback_Tooltips,
 		eLibraryFallback_Default,
 #endif
-#endif
 
 		eLibrary_Count,
 	};
@@ -137,7 +139,7 @@ private:
 
 	C4JRender::eViewportType m_currentRenderViewport;
 	bool m_bCustomRenderPosition;
-	
+
 	static DWORD				m_dwTrialTimerLimitSecs;
 
 	unordered_map<wstring, byteArray> m_substitutionTextures;
@@ -145,7 +147,7 @@ private:
 	typedef struct _CachedMovieData
 	{
 		byteArray m_ba;
-		__int64 m_expiry;
+		int64_t m_expiry;
 	} CachedMovieData;
 	unordered_map<wstring, CachedMovieData> m_cachedMovieData;
 
@@ -160,6 +162,8 @@ private:
 	unsigned int m_winUserIndex;
 	EUIScene m_mouseDraggingSliderScene;
 	int m_mouseDraggingSliderId;
+	bool m_mouseClickConsumedByScene;
+	bool m_bMouseHoverHorizontalList;
 	int m_lastHoverMouseX;
 	int m_lastHoverMouseY;
 	//bool m_bSysUIShowing;
@@ -167,7 +171,7 @@ private:
 	C4JThread *m_reloadSkinThread;
 	bool m_navigateToHomeOnReload;
 	int m_accumulatedTicks;
-	__uint64 m_lastUiSfx; // Tracks time (ms) of last UI sound effect
+	uint64_t m_lastUiSfx; // Tracks time (ms) of last UI sound effect
 
 	D3D11_RECT m_customRenderingClearRect;
 
@@ -211,7 +215,7 @@ protected:
 	void postInit();
 
 
-public:	
+public:
 	CRITICAL_SECTION m_Allocatorlock;
 	void SetupFont();
 	bool PendingFontChange();
@@ -243,7 +247,7 @@ private:
 	void tickInput();
 	void handleInput();
 	void handleKeyPress(unsigned int iPad, unsigned int key);
-	
+
 protected:
 	static rrbool RADLINK ExternalFunctionCallback( void * user_callback_data , Iggy * player , IggyExternalFunctionCallUTF16 * call );
 
@@ -251,6 +255,7 @@ public:
 	// RENDERING
 	float getScreenWidth() { return m_fScreenWidth; }
 	float getScreenHeight() { return m_fScreenHeight; }
+	void updateScreenSize(S32 w, S32 h) { m_fScreenWidth = (float)w; m_fScreenHeight = (float)h; app.DebugPrintf("[UI-INIT] updateScreenSize: %d x %d\n", w, h); }
 
 	virtual void render() = 0;
 	void getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height);
@@ -287,7 +292,7 @@ protected:
 	static GDrawTexture * RADLINK TextureSubstitutionCreateCallback( void * user_callback_data , IggyUTF16 * texture_name , S32 * width , S32 * height , void **destroy_callback_data );
 	static void RADLINK TextureSubstitutionDestroyCallback( void * user_callback_data , void * destroy_callback_data , GDrawTexture * handle );
 
-	virtual GDrawTexture *getSubstitutionTexture(int textureId) { return NULL; }
+	virtual GDrawTexture *getSubstitutionTexture(int textureId) { return nullptr; }
 	virtual void destroySubstitutionTexture(void *destroyCallBackData, GDrawTexture *handle) {}
 
 public:
@@ -296,7 +301,7 @@ public:
 
 public:
 	// NAVIGATION
-	bool NavigateToScene(int iPad, EUIScene scene, void *initData = NULL, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
+	bool NavigateToScene(int iPad, EUIScene scene, void *initData = nullptr, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
 	bool NavigateBack(int iPad, bool forceUsePad = false, EUIScene eScene = eUIScene_COUNT, EUILayer eLayer = eUILayer_COUNT);
 	void NavigateToHomeMenu();
 	UIScene *GetTopScene(int iPad, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
@@ -313,7 +318,7 @@ private:
 public:
 	void CloseAllPlayersScenes();
 	void CloseUIScenes(int iPad, bool forceIPad = false);
-	
+
 	virtual bool IsPauseMenuDisplayed(int iPad);
 	virtual bool IsContainerMenuDisplayed(int iPad);
 	virtual bool IsIgnorePlayerJoinMenuDisplayed(int iPad);
@@ -376,14 +381,14 @@ public:
 	virtual void HidePressStart();
 	void ClearPressStart();
 
-	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
-	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
+	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
+	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
 private:
 	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
 
 public:
-	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);
-	C4JStorage::EMessageResult RequestContentRestrictedMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);
+	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
+	C4JStorage::EMessageResult RequestContentRestrictedMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
 
 	virtual void SetWinUserIndex(unsigned int iPad);
 	unsigned int GetWinUserIndex();
diff --git a/Minecraft.Client/Common/UI/UIFontData.cpp b/Minecraft.Client/Common/UI/UIFontData.cpp
index c5ad46ef..715d08dd 100644
--- a/Minecraft.Client/Common/UI/UIFontData.cpp
+++ b/Minecraft.Client/Common/UI/UIFontData.cpp
@@ -145,9 +145,9 @@ CFontData::CFontData()
 {
 	m_unicodeMap = unordered_map<unsigned int, unsigned short>();
 
-	m_sFontData = NULL;
-	m_kerningTable = NULL;
-	m_pbRawImage = NULL;
+	m_sFontData = nullptr;
+	m_kerningTable = nullptr;
+	m_pbRawImage = nullptr;
 }
 
 CFontData::CFontData(SFontData &sFontData, int *pbRawImage)
diff --git a/Minecraft.Client/Common/UI/UIGroup.cpp b/Minecraft.Client/Common/UI/UIGroup.cpp
index e8bb9fe6..baccc17f 100644
--- a/Minecraft.Client/Common/UI/UIGroup.cpp
+++ b/Minecraft.Client/Common/UI/UIGroup.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "UIGroup.h"
 
+#include "UI.h"
+
 UIGroup::UIGroup(EUIGroup group, int iPad)
 {
 	m_group = group;
@@ -23,22 +25,22 @@ UIGroup::UIGroup(EUIGroup group, int iPad)
 #endif
 	}
 
-	m_tooltips = (UIComponent_Tooltips *)m_layers[(int)eUILayer_Tooltips]->addComponent(0, eUIComponent_Tooltips);
+	m_tooltips = (UIComponent_Tooltips *)m_layers[static_cast<int>(eUILayer_Tooltips)]->addComponent(0, eUIComponent_Tooltips);
 
-	m_tutorialPopup = NULL;
-	m_hud = NULL;
-	m_pressStartToPlay = NULL;
+	m_tutorialPopup = nullptr;
+	m_hud = nullptr;
+	m_pressStartToPlay = nullptr;
 	if(m_group != eUIGroup_Fullscreen)
 	{
-		m_tutorialPopup = (UIComponent_TutorialPopup *)m_layers[(int)eUILayer_Popup]->addComponent(m_iPad, eUIComponent_TutorialPopup);
+		m_tutorialPopup = (UIComponent_TutorialPopup *)m_layers[static_cast<int>(eUILayer_Popup)]->addComponent(m_iPad, eUIComponent_TutorialPopup);
 
-		m_hud = (UIScene_HUD *)m_layers[(int)eUILayer_HUD]->addComponent(m_iPad, eUIScene_HUD);
+		m_hud = (UIScene_HUD *)m_layers[static_cast<int>(eUILayer_HUD)]->addComponent(m_iPad, eUIScene_HUD);
 
 		//m_layers[(int)eUILayer_Chat]->addComponent(m_iPad, eUIComponent_Chat);
 	}
 	else
 	{
-		m_pressStartToPlay = (UIComponent_PressStartToPlay *)m_layers[(int)eUILayer_Tooltips]->addComponent(0, eUIComponent_PressStartToPlay);
+		m_pressStartToPlay = (UIComponent_PressStartToPlay *)m_layers[static_cast<int>(eUILayer_Tooltips)]->addComponent(0, eUIComponent_PressStartToPlay);
 	}
 
 	// 4J Stu - Pre-allocate this for cached rendering in scenes. It's horribly slow to do dynamically, but we should only need one
@@ -65,7 +67,7 @@ void UIGroup::ReloadAll()
 	if(highestRenderable < eUILayer_Fullscreen) highestRenderable = eUILayer_Fullscreen;
 	for(; highestRenderable >= 0; --highestRenderable)
 	{
-		if(highestRenderable < eUILayer_COUNT) m_layers[highestRenderable]->ReloadAll(highestRenderable != (int)eUILayer_Fullscreen);
+		if(highestRenderable < eUILayer_COUNT) m_layers[highestRenderable]->ReloadAll(highestRenderable != static_cast<int>(eUILayer_Fullscreen));
 	}
 }
 
@@ -81,7 +83,7 @@ void UIGroup::tick()
 	}
 
 	// Handle deferred update focus
-	if (m_updateFocusStateCountdown > 0) 
+	if (m_updateFocusStateCountdown > 0)
 	{
 		m_updateFocusStateCountdown--;
 		if (m_updateFocusStateCountdown == 0)_UpdateFocusState();
@@ -127,7 +129,7 @@ void UIGroup::getRenderDimensions(S32 &width, S32 &height)
 // NAVIGATION
 bool UIGroup::NavigateToScene(int iPad, EUIScene scene, void *initData, EUILayer layer)
 {
-	bool succeeded = m_layers[(int)layer]->NavigateToScene(iPad, scene, initData);
+	bool succeeded = m_layers[static_cast<int>(layer)]->NavigateToScene(iPad, scene, initData);
 	updateStackStates();
 	return succeeded;
 }
@@ -151,9 +153,9 @@ void UIGroup::closeAllScenes()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	if( m_iPad >= 0 )
 	{
-		if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
+		if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
 		{
-			TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+			TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 
 			// This just allows it to be shown
 			gameMode->getTutorial()->showTutorialPopup(true);
@@ -163,14 +165,14 @@ void UIGroup::closeAllScenes()
 	for(unsigned int i = 0; i < eUILayer_COUNT; ++i)
 	{
 		// Ignore the error layer
-		if(i != (int)eUILayer_Error) m_layers[i]->closeAllScenes();
+		if(i != static_cast<int>(eUILayer_Error)) m_layers[i]->closeAllScenes();
 	}
 	updateStackStates();
 }
 
 UIScene *UIGroup::GetTopScene(EUILayer layer)
 {
-	return m_layers[(int)layer]->GetTopScene();
+	return m_layers[static_cast<int>(layer)]->GetTopScene();
 }
 
 bool UIGroup::GetMenuDisplayed()
@@ -214,10 +216,10 @@ UIScene *UIGroup::getCurrentScene()
 	{
 		pScene=m_layers[i]->getCurrentScene();
 
-		if(pScene!=NULL) return pScene;
+		if(pScene!=nullptr) return pScene;
 	}
 
-	return NULL;
+	return nullptr;
 }
 #endif
 
@@ -233,7 +235,7 @@ void UIGroup::handleInput(int iPad, int key, bool repeat, bool pressed, bool rel
 	}
 }
 
-// FOCUS 
+// FOCUS
 
 // Check that a layer may recieve focus, specifically that there is no infocus layer above
 bool UIGroup::RequestFocus(UILayer* layerPtr)
@@ -389,16 +391,16 @@ unsigned int UIGroup::GetLayerIndex(UILayer* layerPtr)
 	// can't get here...
 	return 0;
 }
-	
-void UIGroup::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
+
+void UIGroup::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic)
 {
-	__int64 groupStatic = 0;
-	__int64 groupDynamic = 0;
+	int64_t groupStatic = 0;
+	int64_t groupDynamic = 0;
 	app.DebugPrintf(app.USER_SR, "-- BEGIN GROUP %d\n",m_group);
 	for(unsigned int i = 0; i < eUILayer_COUNT; ++i)
 	{
 		app.DebugPrintf(app.USER_SR, "  \\- BEGIN LAYER %d\n",i);
-		m_layers[i]->PrintTotalMemoryUsage(groupStatic, groupDynamic);		
+		m_layers[i]->PrintTotalMemoryUsage(groupStatic, groupDynamic);
 		app.DebugPrintf(app.USER_SR, "  \\- END LAYER %d\n",i);
 	}
 	app.DebugPrintf(app.USER_SR, "-- Group static: %d, Group dynamic: %d\n", groupStatic, groupDynamic);
@@ -412,16 +414,16 @@ int UIGroup::getCommandBufferList()
 	return m_commandBufferList;
 }
 
-// Returns the first scene of given type if it exists, NULL otherwise 
+// Returns the first scene of given type if it exists, nullptr otherwise 
 UIScene *UIGroup::FindScene(EUIScene sceneType)
 {
-	UIScene *pScene = NULL;
+	UIScene *pScene = nullptr;
 
 	for (int i = 0; i < eUILayer_COUNT; i++)
 	{
 		pScene = m_layers[i]->FindScene(sceneType);
 #ifdef __PS3__
-		if (pScene != NULL) return pScene;
+		if (pScene != nullptr) return pScene;
 #else
 		if (pScene != nullptr) return pScene;
 #endif
diff --git a/Minecraft.Client/Common/UI/UIGroup.h b/Minecraft.Client/Common/UI/UIGroup.h
index 28369f27..403a32ae 100644
--- a/Minecraft.Client/Common/UI/UIGroup.h
+++ b/Minecraft.Client/Common/UI/UIGroup.h
@@ -19,10 +19,10 @@ private:
 	UIScene_HUD *m_hud;
 
 	C4JRender::eViewportType m_viewportType;
-	
+
 	EUIGroup m_group;
 	int m_iPad;
-	
+
 	bool m_bMenuDisplayed;
 	bool m_bPauseMenuDisplayed;
 	bool m_bContainerMenuDisplayed;
@@ -88,7 +88,7 @@ public:
 
 	void SetViewportType(C4JRender::eViewportType type);
 	C4JRender::eViewportType GetViewportType();
-	
+
 	virtual void HandleDLCMountingComplete();
 	virtual void HandleDLCInstalled();
 #ifdef _XBOX_ONE
@@ -99,15 +99,15 @@ public:
 	bool IsFullscreenGroup();
 
 	void handleUnlockFullVersion();
-	
-	void PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic);
+
+	void PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic);
 
 	unsigned int GetLayerIndex(UILayer* layerPtr);
 
 	int getCommandBufferList();
 	UIScene *FindScene(EUIScene sceneType);
 
-private:	
+private:
 	void _UpdateFocusState();
 	void updateStackStates();
 };
diff --git a/Minecraft.Client/Common/UI/UILayer.cpp b/Minecraft.Client/Common/UI/UILayer.cpp
index b3cf72a0..e1c388f5 100644
--- a/Minecraft.Client/Common/UI/UILayer.cpp
+++ b/Minecraft.Client/Common/UI/UILayer.cpp
@@ -102,7 +102,7 @@ void UILayer::render(S32 width, S32 height, C4JRender::eViewportType viewport)
 bool UILayer::IsSceneInStack(EUIScene scene)
 {
 	bool inStack = false;
-	for(int i = m_sceneStack.size() - 1;i >= 0; --i)
+	for(int i = static_cast<int>(m_sceneStack.size()) - 1; i >= 0; --i)
 	{
 		if(m_sceneStack[i]->getSceneType() == scene)
 		{
@@ -118,7 +118,7 @@ bool UILayer::HasFocus(int iPad)
 	bool hasFocus = false;
 	if(m_hasFocus)
 	{
-		for(int i = m_sceneStack.size() - 1;i >= 0; --i)
+		for(int i = (int)m_sceneStack.size() - 1; i >= 0; --i)
 		{
 			if(m_sceneStack[i]->stealsFocus() )
 			{
@@ -146,7 +146,7 @@ bool UILayer::hidesLowerScenes()
 	}
 	if(!hidesScenes && !m_sceneStack.empty())
 	{
-		for(int i = m_sceneStack.size() - 1;i >= 0; --i)
+		for(int i = static_cast<int>(m_sceneStack.size()) - 1; i >= 0; --i)
 		{
 			if(m_sceneStack[i]->hidesLowerScenes())
 			{
@@ -197,7 +197,7 @@ bool UILayer::GetMenuDisplayed()
 
 bool UILayer::NavigateToScene(int iPad, EUIScene scene, void *initData)
 {
-	UIScene *newScene = NULL;
+	UIScene *newScene = nullptr;
 	switch(scene)
 	{
 		// Debug
@@ -424,7 +424,7 @@ bool UILayer::NavigateToScene(int iPad, EUIScene scene, void *initData)
 		break;
 	};
 
-	if(newScene == NULL)
+	if(newScene == nullptr)
 	{
 		app.DebugPrintf("WARNING: Scene %d was not created. Add it to UILayer::NavigateToScene\n", scene);
 		return false;
@@ -451,7 +451,7 @@ bool UILayer::NavigateBack(int iPad, EUIScene eScene)
 	bool navigated = false;
 	if(eScene < eUIScene_COUNT)
 	{
-		UIScene *scene = NULL;
+		UIScene *scene = nullptr;
 		do
 		{
 			scene = m_sceneStack.back();
@@ -523,9 +523,9 @@ UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData)
 				return itComp;
 			}
 		}
-		return NULL;
+		return nullptr;
 	}
-	UIScene *newScene = NULL;
+	UIScene *newScene = nullptr;
 
 	switch(scene)
 	{
@@ -573,7 +573,7 @@ UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData)
 		break;
 	};
 
-	if(newScene == NULL) return NULL;
+	if(newScene == nullptr) return nullptr;
 
 	m_components.push_back(newScene);
 
@@ -661,12 +661,12 @@ void UILayer::closeAllScenes()
 	}
 }
 
-// Get top scene on stack (or NULL if stack is empty)
+// Get top scene on stack (or nullptr if stack is empty)
 UIScene *UILayer::GetTopScene()
 {
 	if(m_sceneStack.size() == 0)
 	{
-		return NULL;
+		return nullptr;
 	}
 	else
 	{
@@ -789,7 +789,7 @@ UIScene *UILayer::getCurrentScene()
 		}
 }
 
-	return NULL;
+	return nullptr;
 }
 #endif
 
@@ -877,10 +877,10 @@ void UILayer::handleUnlockFullVersion()
 	}
 }
 
-void UILayer::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
+void UILayer::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic)
 {
-	__int64 layerStatic = 0;
-	__int64 layerDynamic = 0;
+	int64_t layerStatic = 0;
+	int64_t layerDynamic = 0;
 	for(auto& it : m_components)
 	{
 		it->PrintTotalMemoryUsage(layerStatic, layerDynamic);
@@ -894,10 +894,10 @@ void UILayer::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
 	totalDynamic += layerDynamic;
 }
 
-// Returns the first scene of given type if it exists, NULL otherwise
+// Returns the first scene of given type if it exists, nullptr otherwise
 UIScene *UILayer::FindScene(EUIScene sceneType)
 {
-	for (int i = 0; i < m_sceneStack.size(); i++)
+	for (size_t i = 0; i < m_sceneStack.size(); i++)
 	{
 		if (m_sceneStack[i]->getSceneType() == sceneType)
 		{
@@ -905,5 +905,5 @@ UIScene *UILayer::FindScene(EUIScene sceneType)
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UILayer.h b/Minecraft.Client/Common/UI/UILayer.h
index 47c776ab..7f1a0bf5 100644
--- a/Minecraft.Client/Common/UI/UILayer.h
+++ b/Minecraft.Client/Common/UI/UILayer.h
@@ -61,17 +61,17 @@ public:
 	// E.g. you can keep a component active while performing navigation with other scenes on this layer
 	void showComponent(int iPad, EUIScene scene, bool show);
 	bool isComponentVisible(EUIScene scene);
-	UIScene *addComponent(int iPad, EUIScene scene, void *initData = NULL);
+	UIScene *addComponent(int iPad, EUIScene scene, void *initData = nullptr);
 	void removeComponent(EUIScene scene);
 
 	// INPUT
 	void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
-#ifdef __PSVITA__	
+#ifdef __PSVITA__
 	// Current active scene
 	UIScene *getCurrentScene();
 #endif
 	// FOCUS
-	
+
 	bool updateFocusState(bool allowedFocus = false);
 
 public:
@@ -87,7 +87,7 @@ public:
 
 	void handleUnlockFullVersion();
 	UIScene *FindScene(EUIScene sceneType);
-	
-	void PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic);
+
+	void PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic);
 
 };
diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp
index 6ef6d0e8..303897a7 100644
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene.h"
+#include "UISplitScreenHelpers.h"
 
 #include "..\..\Lighting.h"
 #include "..\..\LocalPlayer.h"
@@ -11,8 +12,8 @@ UIScene::UIScene(int iPad, UILayer *parentLayer)
 {
 	m_parentLayer = parentLayer;
 	m_iPad = iPad;
-	swf = NULL;
-	m_pItemRenderer = NULL;
+	swf = nullptr;
+	m_pItemRenderer = nullptr;
 
 	bHasFocus = false;
 	m_hasTickedOnce = false;
@@ -26,7 +27,7 @@ UIScene::UIScene(int iPad, UILayer *parentLayer)
 	m_lastOpacity = 1.0f;
 	m_bUpdateOpacity = false;
 
-	m_backScene = NULL;
+	m_backScene = nullptr;
 
 	m_cacheSlotRenders = false;
 	m_needsCacheRendered = true;
@@ -49,14 +50,14 @@ UIScene::~UIScene()
 		ui.UnregisterCallbackId(m_callbackUniqueId);
 	}
 
-	if(m_pItemRenderer != NULL) delete m_pItemRenderer;
+	if(m_pItemRenderer != nullptr) delete m_pItemRenderer;
 }
 
 void UIScene::destroyMovie()
 {
 	/* Destroy the Iggy player. */
 	IggyPlayerDestroy( swf );
-	swf = NULL;
+	swf = nullptr;
 
 	// Clear out the controls collection (doesn't delete the controls, and they get re-setup later)
 	m_controls.clear();
@@ -115,7 +116,7 @@ bool UIScene::needsReloaded()
 
 bool UIScene::hasMovie()
 {
-	return swf != NULL;
+	return swf != nullptr;
 }
 
 F64 UIScene::getSafeZoneHalfHeight()
@@ -171,15 +172,22 @@ void UIScene::updateSafeZone()
 	{
 	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
 		safeTop = getSafeZoneHalfHeight();
+		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		safeBottom = getSafeZoneHalfHeight();
+		// safeTop mirrors SPLIT_TOP for visual symmetry. safeBottom omitted.
+		safeTop = getSafeZoneHalfHeight();
+		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		safeTop = getSafeZoneHalfHeight();
@@ -187,22 +195,22 @@ void UIScene::updateSafeZone()
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		safeTop = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		safeBottom = getSafeZoneHalfHeight();
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
 	default:
 		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	}
 	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);
@@ -234,7 +242,7 @@ void UIScene::initialiseMovie()
 	m_bUpdateOpacity = true;
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 void UIScene::SetFocusToElement(int iID)
 {
 	IggyDataValue result;
@@ -285,25 +293,15 @@ void UIScene::loadMovie()
 	moviePath.append(L"Vita.swf");
 	m_loadedResolution = eSceneResolution_Vita;
 #elif defined _WINDOWS64
-	if(ui.getScreenHeight() == 720)
-	{
-		moviePath.append(L"720.swf");
-		m_loadedResolution = eSceneResolution_720;
-	}
-	else if(ui.getScreenHeight() == 480)
+	if(ui.getScreenHeight() > 720.0f)
 	{
-		moviePath.append(L"480.swf");
-		m_loadedResolution = eSceneResolution_480;
-	}
-	else if(ui.getScreenHeight() < 720)
-	{
-		moviePath.append(L"Vita.swf");
-		m_loadedResolution = eSceneResolution_Vita;
+		moviePath.append(L"1080.swf");
+		m_loadedResolution = eSceneResolution_1080;
 	}
 	else
 	{
-		moviePath.append(L"1080.swf");
-		m_loadedResolution = eSceneResolution_1080;
+		moviePath.append(L"720.swf");
+		m_loadedResolution = eSceneResolution_720;
 	}
 #else
 	moviePath.append(L"1080.swf");
@@ -329,11 +327,9 @@ void UIScene::loadMovie()
 	}
 
 	byteArray baFile = ui.getMovieData(moviePath.c_str());
-	__int64 beforeLoad = ui.iggyAllocCount;
-	swf = IggyPlayerCreateFromMemory ( baFile.data , baFile.length, NULL);
-	__int64 afterLoad = ui.iggyAllocCount;
-	IggyPlayerInitializeAndTickRS ( swf );
-	__int64 afterTick = ui.iggyAllocCount;
+	int64_t beforeLoad = ui.iggyAllocCount;
+	swf = IggyPlayerCreateFromMemory ( baFile.data , baFile.length, nullptr);
+	int64_t afterLoad = ui.iggyAllocCount;
 
 	if(!swf)
 	{
@@ -343,17 +339,44 @@ void UIScene::loadMovie()
 #endif
 		app.FatalLoadError();
 	}
-	app.DebugPrintf( app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str() );
+
+	// Read movie dimensions from the SWF header (available immediately after
+	// CreateFromMemory, no init tick needed).
 	IggyProperties *properties = IggyPlayerProperties ( swf );
 	m_movieHeight = properties->movie_height_in_pixels;
 	m_movieWidth = properties->movie_width_in_pixels;
-
 	m_renderWidth = m_movieWidth;
 	m_renderHeight = m_movieHeight;
 
-	S32 width, height;
-	m_parentLayer->getRenderDimensions(width, height);
-	IggyPlayerSetDisplaySize( swf, width, height );
+	// Set display size BEFORE the init tick to match what render() will use.
+	// InitializeAndTickRS runs ActionScript that creates text fields. If the
+	// display size here differs from what render() passes to SetDisplaySize,
+	// Iggy can cache glyph rasterizations at one scale during init and then
+	// reuse them at a different scale during draw, producing mixed glyph sizes.
+#ifdef _WINDOWS64
+	{
+		S32 fitW, fitH, fitOffX, fitOffY;
+		Fit16x9(ui.getScreenWidth(), ui.getScreenHeight(), fitW, fitH, fitOffX, fitOffY);
+		IggyPlayerSetDisplaySize( swf, fitW, fitH );
+	}
+#else
+	IggyPlayerSetDisplaySize( swf, m_movieWidth, m_movieHeight );
+#endif
+
+	IggyPlayerInitializeAndTickRS ( swf );
+	int64_t afterTick = ui.iggyAllocCount;
+
+#ifdef _WINDOWS64
+	// Flush Iggy's internal font caches so all glyphs get rasterized fresh
+	// at the current display scale on the first Draw. Without this, stale
+	// cache entries from a previous scene (loaded at a different display size)
+	// cause mixed glyph sizes. ResizeD3D already calls this, which is why
+	// fonts look correct after a resize but break when a scene reloads
+	// without one.
+	IggyFlushInstalledFonts();
+#endif
+
+	app.DebugPrintf( app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str() );
 
 	IggyPlayerSetUserdata(swf,this);
 
@@ -362,10 +385,10 @@ void UIScene::loadMovie()
 	IggyMemoryUseInfo memoryInfo;
 	rrbool res;
 	int iteration = 0;
-	__int64 totalStatic = 0;
-	__int64 totalDynamic = 0;
+	int64_t totalStatic = 0;
+	int64_t totalDynamic = 0;
 	while(res = IggyDebugGetMemoryUseInfo ( swf ,
-		NULL ,
+		nullptr ,
 		0 ,
 		0 ,
 		iteration ,
@@ -389,34 +412,35 @@ void UIScene::loadMovie()
 
 void UIScene::getDebugMemoryUseRecursive(const wstring &moviePath, IggyMemoryUseInfo &memoryInfo)
 {
-	rrbool res;
-	IggyMemoryUseInfo internalMemoryInfo;
-	int internalIteration = 0;
-	while(res = IggyDebugGetMemoryUseInfo ( swf ,
-		NULL ,
-		memoryInfo.subcategory ,
-		memoryInfo.subcategory_stringlen ,
-		internalIteration ,
-		&internalMemoryInfo ))
-	{
-		app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory,
-			internalMemoryInfo.static_allocation_bytes, internalMemoryInfo.static_allocation_count, internalMemoryInfo.dynamic_allocation_bytes, internalMemoryInfo.dynamic_allocation_count);
-		++internalIteration;
-		if(internalMemoryInfo.subcategory_stringlen > memoryInfo.subcategory_stringlen) getDebugMemoryUseRecursive(moviePath, internalMemoryInfo);
-	}
+    rrbool res;
+    IggyMemoryUseInfo internalMemoryInfo;
+    int internalIteration = 0;
+    while (res = IggyDebugGetMemoryUseInfo(swf,
+                                           0,
+                                           memoryInfo.subcategory,
+                                           memoryInfo.subcategory_stringlen,
+                                           internalIteration,
+                                           &internalMemoryInfo))
+    {
+        app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory,
+                        internalMemoryInfo.static_allocation_bytes, internalMemoryInfo.static_allocation_count, internalMemoryInfo.dynamic_allocation_bytes, internalMemoryInfo.dynamic_allocation_count);
+        ++internalIteration;
+        if (internalMemoryInfo.subcategory_stringlen > memoryInfo.subcategory_stringlen)
+            getDebugMemoryUseRecursive(moviePath, internalMemoryInfo);
+    }
 }
 
-void UIScene::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
+void UIScene::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic)
 {
 	if(!swf) return;
 
 	IggyMemoryUseInfo memoryInfo;
 	rrbool res;
 	int iteration = 0;
-	__int64 sceneStatic = 0;
-	__int64 sceneDynamic = 0;
+	int64_t sceneStatic = 0;
+	int64_t sceneDynamic = 0;
 	while(res = IggyDebugGetMemoryUseInfo ( swf ,
-		NULL ,
+		0 ,
 		"" ,
 		0 ,
 		iteration ,
@@ -447,13 +471,136 @@ void UIScene::tick()
 		IggyPlayerTickRS( swf );
 		m_hasTickedOnce = true;
 	}
+
+#ifdef _WINDOWS64
+	{
+		vector<UIControl_TextInput*> inputs;
+		getDirectEditInputs(inputs);
+		for (size_t i = 0; i < inputs.size(); i++)
+		{
+			UIControl_TextInput::EDirectEditResult result = inputs[i]->tickDirectEdit();
+			if (result != UIControl_TextInput::eDirectEdit_Continue)
+				onDirectEditFinished(inputs[i], result);
+		}
+	}
+#endif
 }
 
 UIControl* UIScene::GetMainPanel()
 {
-	return NULL;
+	return nullptr;
 }
 
+#ifdef _WINDOWS64
+bool UIScene::isDirectEditBlocking()
+{
+	vector<UIControl_TextInput*> inputs;
+	getDirectEditInputs(inputs);
+	for (size_t i = 0; i < inputs.size(); i++)
+	{
+		if (inputs[i]->isDirectEditing() || inputs[i]->getDirectEditCooldown() > 0)
+			return true;
+	}
+	return false;
+}
+
+bool UIScene::handleMouseClick(F32 x, F32 y)
+{
+	S32 panelOffsetX = 0, panelOffsetY = 0;
+	UIControl *pMainPanel = GetMainPanel();
+	if (pMainPanel)
+	{
+		pMainPanel->UpdateControl();
+		panelOffsetX = pMainPanel->getXPos();
+		panelOffsetY = pMainPanel->getYPos();
+	}
+
+	// Click-outside-to-deselect: confirm any active direct edit if
+	// the click landed outside the editing text input.
+	{
+		vector<UIControl_TextInput*> deInputs;
+		getDirectEditInputs(deInputs);
+		for (size_t i = 0; i < deInputs.size(); i++)
+		{
+			if (!deInputs[i]->isDirectEditing())
+				continue;
+			deInputs[i]->UpdateControl();
+			S32 cx = deInputs[i]->getXPos() + panelOffsetX;
+			S32 cy = deInputs[i]->getYPos() + panelOffsetY;
+			S32 cw = deInputs[i]->getWidth();
+			S32 ch = deInputs[i]->getHeight();
+			if (!(cw > 0 && ch > 0 && x >= cx && x <= cx + cw && y >= cy && y <= cy + ch))
+			{
+				deInputs[i]->confirmDirectEdit();
+				onDirectEditFinished(deInputs[i], UIControl_TextInput::eDirectEdit_Confirmed);
+			}
+		}
+	}
+
+	vector<UIControl *> *controls = GetControls();
+	if (!controls) return false;
+
+	// Hit-test controls and pick the smallest-area match to handle
+	// overlapping Flash bounds correctly without sacrificing precision.
+	int bestId = -1;
+	S32 bestArea = INT_MAX;
+	UIControl *bestCtrl = NULL;
+
+	for (size_t i = 0; i < controls->size(); ++i)
+	{
+		UIControl *ctrl = (*controls)[i];
+		if (!ctrl || ctrl->getHidden() || !ctrl->getVisible() || ctrl->getId() < 0)
+			continue;
+
+		UIControl::eUIControlType type = ctrl->getControlType();
+		if (type != UIControl::eButton && type != UIControl::eTextInput &&
+			type != UIControl::eCheckBox)
+			continue;
+
+		if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+			continue;
+
+		ctrl->UpdateControl();
+		S32 cx = ctrl->getXPos() + panelOffsetX;
+		S32 cy = ctrl->getYPos() + panelOffsetY;
+		S32 cw = ctrl->getWidth();
+		S32 ch = ctrl->getHeight();
+		if (cw <= 0 || ch <= 0)
+			continue;
+
+		if (x >= cx && x <= cx + cw && y >= cy && y <= cy + ch)
+		{
+			S32 area = cw * ch;
+			if (area < bestArea)
+			{
+				bestArea = area;
+				bestId = ctrl->getId();
+				bestCtrl = ctrl;
+			}
+		}
+	}
+
+	if (bestId >= 0 && bestCtrl)
+	{
+		if (bestCtrl->getControlType() == UIControl::eCheckBox)
+		{
+			UIControl_CheckBox *cb = static_cast<UIControl_CheckBox*>(bestCtrl);
+			if (cb->IsEnabled())
+			{
+				bool newState = !cb->IsChecked();
+				cb->setChecked(newState);
+				handleCheckboxToggled((F64)bestId, newState);
+			}
+		}
+		else
+		{
+			handlePress((F64)bestId, 0);
+		}
+		return true;
+	}
+	return false;
+}
+#endif
 
 void UIScene::addTimer(int id, int ms)
 {
@@ -534,39 +681,54 @@ void UIScene::removeControl( UIControl_Base *control, bool centreScene)
 	// update the button positions since they may have changed
 	UpdateSceneControls();
 
-	// mark the button as removed
-	control->setHidden(true);
 	// remove it from the touchboxes
 	ui.TouchBoxRebuild(control->getParentScene());
 #endif
 
+	// mark the button as removed so hover/touch hit-tests skip it
+	control->setHidden(true);
+
 }
 
 void UIScene::slideLeft()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideLeft , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideLeft , 0 , nullptr );
 }
 
 void UIScene::slideRight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideRight , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideRight , 0 , nullptr );
 }
 
 void UIScene::doHorizontalResizeCheck()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHorizontalResizeCheck , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHorizontalResizeCheck , 0 , nullptr );
 }
 
 void UIScene::render(S32 width, S32 height, C4JRender::eViewportType viewport)
 {
 	if(m_bIsReloading) return;
 	if(!m_hasTickedOnce || !swf) return;
-	ui.setupRenderPosition(viewport);
-	IggyPlayerSetDisplaySize( swf, width, height );
-	IggyPlayerDraw( swf );
+
+	if(viewport != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+	{
+		F32 originX, originY, viewW, viewH;
+		GetViewportRect(ui.getScreenWidth(), ui.getScreenHeight(), viewport, originX, originY, viewW, viewH);
+		S32 fitW, fitH, offsetX, offsetY;
+		Fit16x9(viewW, viewH, fitW, fitH, offsetX, offsetY);
+		ui.setupRenderPosition(static_cast<S32>(originX) + offsetX, static_cast<S32>(originY) + offsetY);
+		IggyPlayerSetDisplaySize( swf, fitW, fitH );
+		IggyPlayerDraw( swf );
+	}
+	else
+	{
+		ui.setupRenderPosition(viewport);
+		IggyPlayerSetDisplaySize( swf, width, height );
+		IggyPlayerDraw( swf );
+	}
 }
 
 void UIScene::setOpacity(float percent)
@@ -600,7 +762,7 @@ void UIScene::customDraw(IggyCustomDrawCallbackRegion *region)
 
 void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iPad, shared_ptr<ItemInstance> item, float fAlpha, bool isFoil, bool bDecorations)
 {
-	if (item!= NULL)
+	if (item!= nullptr)
 	{
 		if(m_cacheSlotRenders)
 		{
@@ -728,7 +890,7 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 	if (pop > 0)
 	{
 		glPushMatrix();
-		float squeeze = 1 + pop / (float) Inventory::POP_TIME_DURATION;
+		float squeeze = 1 + pop / static_cast<float>(Inventory::POP_TIME_DURATION);
 		float sx = x;
 		float sy = y;
 		float sxoffs = 8 * scaleX;
@@ -739,7 +901,7 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 	}
 
 	PIXBeginNamedEvent(0,"Render and decorate");
-	if(m_pItemRenderer == NULL) m_pItemRenderer = new ItemRenderer();
+	if(m_pItemRenderer == nullptr) m_pItemRenderer = new ItemRenderer();
 	RenderManager.StateSetBlendEnable(true);
 	RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	RenderManager.StateSetBlendFactor(0xffffffff);
@@ -757,15 +919,15 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 		{
 			glPushMatrix();
 			glScalef(scaleX, scaleY, 1.0f);
-			int iX= (int)(0.5f+((float)x)/scaleX);
-			int iY= (int)(0.5f+((float)y)/scaleY);
+			int iX= static_cast<int>(0.5f + ((float)x) / scaleX);
+			int iY= static_cast<int>(0.5f + ((float)y) / scaleY);
 
 			m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, item, iX, iY, fAlpha);
 			glPopMatrix();
 		}
 		else
 		{
-			m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, item, (int)x, (int)y, fAlpha);
+			m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, item, static_cast<int>(x), static_cast<int>(y), fAlpha);
 		}
 	}
 
@@ -776,9 +938,9 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 // 4J Stu - Not threadsafe
 //void UIScene::navigateForward(int iPad, EUIScene scene, void *initData)
 //{
-//	if(m_parentLayer == NULL)
+//	if(m_parentLayer == nullptr)
 //	{
-//		app.DebugPrintf("A scene is trying to navigate forwards, but it's parent layer is NULL!\n");
+//		app.DebugPrintf("A scene is trying to navigate forwards, but it's parent layer is nullptr!\n");
 //#ifndef _CONTENT_PACKAGE
 //		__debugbreak();
 //#endif
@@ -796,9 +958,9 @@ void UIScene::navigateBack()
 
 	ui.NavigateBack(m_iPad);
 
-	if(m_parentLayer == NULL)
+	if(m_parentLayer == nullptr)
 	{
-//		app.DebugPrintf("A scene is trying to navigate back, but it's parent layer is NULL!\n");
+//		app.DebugPrintf("A scene is trying to navigate back, but it's parent layer is nullptr!\n");
 #ifndef _CONTENT_PACKAGE
 //		__debugbreak();
 #endif
@@ -900,9 +1062,28 @@ void UIScene::sendInputToMovie(int key, bool repeat, bool pressed, bool released
 		app.DebugPrintf("UI WARNING: Ignoring input as game action does not translate to an Iggy keycode\n");
 		return;
 	}
+
+#ifdef _WINDOWS64
+	// If a navigation key is pressed with no focused element, focus the first
+	// available one so arrow keys work even when the mouse is over empty space.
+	if(pressed && (iggyKeyCode == IGGY_KEYCODE_UP || iggyKeyCode == IGGY_KEYCODE_DOWN ||
+	               iggyKeyCode == IGGY_KEYCODE_LEFT || iggyKeyCode == IGGY_KEYCODE_RIGHT))
+	{
+		IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
+		IggyFocusableObject focusables[64];
+		S32 numFocusables = 0;
+		IggyPlayerGetFocusableObjects(swf, &currentFocus, focusables, 64, &numFocusables);
+		if(currentFocus == IGGY_FOCUS_NULL && numFocusables > 0)
+		{
+			IggyPlayerSetFocusRS(swf, focusables[0].object, 0);
+			return;
+		}
+	}
+#endif
+
 	IggyEvent keyEvent;
 	// 4J Stu - Keyloc is always standard as we don't care about shift/alt
-	IggyMakeEventKey( &keyEvent, pressed?IGGY_KEYEVENT_Down:IGGY_KEYEVENT_Up, (IggyKeycode)iggyKeyCode, IGGY_KEYLOC_Standard );
+	IggyMakeEventKey( &keyEvent, pressed?IGGY_KEYEVENT_Down:IGGY_KEYEVENT_Up, static_cast<IggyKeycode>(iggyKeyCode), IGGY_KEYLOC_Standard );
 
 	IggyEventResult result;
 	IggyPlayerDispatchEventRS ( swf , &keyEvent , &result );
@@ -1191,17 +1372,22 @@ bool UIScene::hasRegisteredSubstitutionTexture(const wstring &textureName)
 
 void UIScene::_handleFocusChange(F64 controlId, F64 childId)
 {
-	m_iFocusControl = (int)controlId;
-	m_iFocusChild = (int)childId;
+	int newControl = static_cast<int>(controlId);
+	int newChild = static_cast<int>(childId);
+	if (newControl != m_iFocusControl || newChild != m_iFocusChild)
+	{
+		m_iFocusControl = newControl;
+		m_iFocusChild = newChild;
 
-	handleFocusChange(controlId, childId);
-	ui.PlayUISFX(eSFX_Focus);
+		handleFocusChange(controlId, childId);
+		ui.PlayUISFX(eSFX_Focus);
+	}
 }
 
 void UIScene::_handleInitFocus(F64 controlId, F64 childId)
 {
-	m_iFocusControl = (int)controlId;
-	m_iFocusChild = (int)childId;
+	m_iFocusControl = static_cast<int>(controlId);
+	m_iFocusChild = static_cast<int>(childId);
 
 	//handleInitFocus(controlId, childId);
 	handleFocusChange(controlId, childId);
diff --git a/Minecraft.Client/Common/UI/UIScene.h b/Minecraft.Client/Common/UI/UIScene.h
index b4008fa0..ca089d39 100644
--- a/Minecraft.Client/Common/UI/UIScene.h
+++ b/Minecraft.Client/Common/UI/UIScene.h
@@ -6,6 +6,7 @@ using namespace std;
 
 #include "UIEnums.h"
 #include "UIControl_Base.h"
+#include "UIControl_TextInput.h"
 
 class ItemRenderer;
 class UILayer;
@@ -16,22 +17,26 @@ class UILayer;
 	virtual bool mapElementsAndNames() \
 	{ \
 		parentClass::mapElementsAndNames(); \
-		IggyValuePath *currentRoot = IggyPlayerRootPath ( getMovie() );
+		IggyValuePath *currentRoot = IggyPlayerRootPath ( getMovie() ); \
+		UIControl *_mapPanel = NULL;
 
 #define UI_END_MAP_ELEMENTS_AND_NAMES() \
 		return true; \
 	}
 
 #define UI_MAP_ELEMENT( var, name) \
-	{ var.setupControl(this, currentRoot , name ); m_controls.push_back(&var); }
+	{ var.setupControl(this, currentRoot , name ); var.m_pParentPanel = _mapPanel; m_controls.push_back(&var); }
 
 #define UI_BEGIN_MAP_CHILD_ELEMENTS( parent ) \
 	{ \
 		IggyValuePath *lastRoot = currentRoot; \
-		currentRoot = parent.getIggyValuePath();
+		UIControl *_lastPanel = _mapPanel; \
+		currentRoot = parent.getIggyValuePath(); \
+		_mapPanel = &parent;
 
 #define UI_END_MAP_CHILD_ELEMENTS() \
 		currentRoot = lastRoot; \
+		_mapPanel = _lastPanel; \
 	}
 
 #define UI_MAP_NAME( var, name ) \
@@ -40,7 +45,7 @@ class UILayer;
 class UIScene
 {
 	friend class UILayer;
-public:	
+public:
 	IggyValuePath *m_rootPath;
 
 private:
@@ -80,7 +85,7 @@ public:
 
 protected:
 	ESceneResolution m_loadedResolution;
-	
+
 	bool m_bIsReloading;
 	bool m_bFocussedOnce;
 
@@ -96,7 +101,7 @@ protected:
 
 public:
 	virtual Iggy *getMovie() { return swf; }
-	
+
 	void destroyMovie();
 	virtual void reloadMovie(bool force = false);
 	virtual bool needsReloaded();
@@ -129,7 +134,7 @@ private:
 	void getDebugMemoryUseRecursive(const wstring &moviePath, IggyMemoryUseInfo &memoryInfo);
 
 public:
-	void PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic);
+	void PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic);
 
 public:
 	UIScene(int iPad, UILayer *parentLayer);
@@ -141,8 +146,10 @@ public:
 	virtual void tick();
 
 	IggyName registerFastName(const wstring &name);
+#if defined(__PSVITA__) || defined(_WINDOWS64)
+	void SetFocusToElement(int iID);
+#endif
 #ifdef __PSVITA__
-	void SetFocusToElement(int iID); 
 	void UpdateSceneControls();
 #endif
 protected:
@@ -162,7 +169,7 @@ public:
 
 	void gainFocus();
 	void loseFocus();
-	
+
 	virtual void updateTooltips();
 	virtual void updateComponents() {}
 	virtual void handleGainFocus(bool navBack);
@@ -177,6 +184,19 @@ public:
 	// returns main panel if controls are not living in the root
 	virtual UIControl* GetMainPanel();
 
+#ifdef _WINDOWS64
+	// Direct edit support: scenes override to register their text inputs.
+	// Base class handles tickDirectEdit in tick(), click-outside-to-deselect
+	// in handleMouseClick(), and provides isDirectEditBlocking() for guards.
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs) {}
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result) {}
+	bool isDirectEditBlocking();
+
+	// Mouse click dispatch. Hit-tests C++ controls and picks the smallest-area
+	// match, then calls handlePress. Override for custom behaviour (e.g. crafting).
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
+
 	void removeControl( UIControl_Base *control, bool centreScene);
 	void slideLeft();
 	void slideRight();
@@ -193,7 +213,7 @@ public:
 protected:
 	//void customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iPad, int iID, int iCount, int iAuxVal, float fAlpha, bool isFoil, bool bDecorations);
 	void customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iPad, shared_ptr<ItemInstance> item, float fAlpha, bool isFoil, bool bDecorations);
-	
+
 	bool m_cacheSlotRenders;
 	bool m_needsCacheRendered;
 	int m_expectedCachedSlotCount;
@@ -245,7 +265,7 @@ public:
 
 	// NAVIGATION
 protected:
-	//void navigateForward(int iPad, EUIScene scene, void *initData = NULL);
+	//void navigateForward(int iPad, EUIScene scene, void *initData = nullptr);
 	void navigateBack();
 
 public:
@@ -269,7 +289,7 @@ public:
 
 protected:
 
-#ifdef _DURANGO	
+#ifdef _DURANGO
 	virtual long long getDefaultGtcButtons() { return _360_GTC_BACK; }
 #endif
 
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
index 6b196c1b..0c3b6096 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_AbstractContainerMenu.h"
+#include "UISplitScreenHelpers.h"
 
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
@@ -49,15 +50,15 @@ void UIScene_AbstractContainerMenu::handleDestroy()
 #endif
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(pMinecraft->localplayers[m_iPad] != NULL && pMinecraft->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
+	if(pMinecraft->localplayers[m_iPad] != nullptr && pMinecraft->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
 	{
 		pMinecraft->localplayers[m_iPad]->closeContainer();
 	}
@@ -149,8 +150,8 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex)
 	m_fPointerMaxX = m_fPanelMaxX + fPointerWidth;
 	m_fPointerMaxY = m_fPanelMaxY + (fPointerHeight/2);
 
-// 	m_hPointerText=NULL;
-// 	m_hPointerTextBkg=NULL;
+// 	m_hPointerText=nullptr;
+// 	m_hPointerTextBkg=nullptr;
 
 	// Put the pointer over first item in use row to start with.
 	UIVec2D itemPos;
@@ -187,14 +188,19 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex)
 	IggyEvent mouseEvent;
 	S32 width, height;
 	m_parentLayer->getRenderDimensions(width, height);
-	S32 x = m_pointerPos.x*((float)width/m_movieWidth);
-	S32 y = m_pointerPos.y*((float)height/m_movieHeight); 
+
+	C4JRender::eViewportType vp = m_parentLayer->getViewport();
+	if(vp != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+		Fit16x9(width, height);
+
+	S32 x = m_pointerPos.x*(static_cast<float>(width)/m_movieWidth);
+	S32 y = m_pointerPos.y*(static_cast<float>(height)/m_movieHeight);
 	IggyMakeEventMouseMove( &mouseEvent, x, y);
 
 	IggyEventResult result;
 	IggyPlayerDispatchEventRS ( getMovie() , &mouseEvent , &result );
 
-#ifdef USE_POINTER_ACCEL	
+#ifdef USE_POINTER_ACCEL
 	m_fPointerVelX = 0.0f;
 	m_fPointerVelY = 0.0f;
 	m_fPointerAccelX = 0.0f;
@@ -212,8 +218,12 @@ void UIScene_AbstractContainerMenu::tick()
 	S32 width, height;
 	m_parentLayer->getRenderDimensions(width, height);
 
-	S32 x = (S32)(m_pointerPos.x * ((float)width / m_movieWidth));
-	S32 y = (S32)(m_pointerPos.y * ((float)height / m_movieHeight));
+	C4JRender::eViewportType vp = m_parentLayer->getViewport();
+	if(vp != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+		Fit16x9(width, height);
+
+	S32 x = static_cast<S32>(m_pointerPos.x * (static_cast<float>(width) / m_movieWidth));
+	S32 y = static_cast<S32>(m_pointerPos.y * (static_cast<float>(height) / m_movieHeight));
 
 	IggyMakeEventMouseMove( &mouseEvent, x, y);
 
@@ -251,10 +261,31 @@ void UIScene_AbstractContainerMenu::render(S32 width, S32 height, C4JRender::eVi
 	m_needsCacheRendered = false;
 }
 
+void UIScene_AbstractContainerMenu::getMouseToSWFScale(float &scaleX, float &scaleY)
+{
+	extern HWND g_hWnd;
+	RECT rc;
+	GetClientRect(g_hWnd, &rc);
+	int winW = rc.right - rc.left;
+	int winH = rc.bottom - rc.top;
+	if(winW <= 0 || winH <= 0) { scaleX = 1.0f; scaleY = 1.0f; return; }
+
+	S32 renderW, renderH;
+	C4JRender::eViewportType vp = GetParentLayer()->getViewport();
+	ui.getRenderDimensions(vp, renderW, renderH);
+	if(vp != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+		Fit16x9(renderW, renderH);
+
+	float screenW = (float)ui.getScreenWidth();
+	float screenH = (float)ui.getScreenHeight();
+	scaleX = static_cast<float>(m_movieWidth) * screenW / (static_cast<float>(renderW) * static_cast<float>(winW));
+	scaleY = static_cast<float>(m_movieHeight) * screenH / (static_cast<float>(renderH) * static_cast<float>(winH));
+}
+
 void UIScene_AbstractContainerMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
@@ -265,7 +296,7 @@ void UIScene_AbstractContainerMenu::customDraw(IggyCustomDrawCallbackRegion *reg
 	}
 	else
 	{
-		swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+		swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 		if (slotId == -1)
 		{
 			app.DebugPrintf("This is not the control we are looking for\n");
@@ -278,7 +309,7 @@ void UIScene_AbstractContainerMenu::customDraw(IggyCustomDrawCallbackRegion *reg
 		}
 	}
 
-	if(item != NULL) customDrawSlotControl(region,m_iPad,item,m_menu->isValidIngredient(item, slotId)?1.0f:0.5f,item->isFoil(),true);
+	if(item != nullptr) customDrawSlotControl(region,m_iPad,item,m_menu->isValidIngredient(item, slotId)?1.0f:0.5f,item->isFoil(),true);
 }
 
 void UIScene_AbstractContainerMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
@@ -337,7 +368,7 @@ Slot *UIScene_AbstractContainerMenu::getSlot(ESceneSection eSection, int iSlot)
 {
 	Slot *slot = m_menu->getSlot( getSectionStartOffset(eSection) + iSlot );
 	if(slot) return slot;
-	else return NULL;
+	else return nullptr;
 }
 
 bool UIScene_AbstractContainerMenu::isSlotEmpty(ESceneSection eSection, int iSlot)
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h
index 605f5dbd..f28a5830 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h
@@ -38,6 +38,7 @@ public:
 	int getPad() { return m_iPad; }
 	int getMovieWidth() { return m_movieWidth; }
 	int getMovieHeight() { return m_movieHeight; }
+	void getMouseToSWFScale(float &scaleX, float &scaleY);
 	bool getIgnoreInput() { return m_bIgnoreInput; }
 	void setIgnoreInput(bool bVal) { m_bIgnoreInput=bVal; }
 
@@ -53,7 +54,7 @@ protected:
 	virtual bool isSlotEmpty(ESceneSection eSection, int iSlot);
 	virtual void adjustPointerForSafeZone();
 
-	virtual UIControl *getSection(ESceneSection eSection) { return NULL; }
+	virtual UIControl *getSection(ESceneSection eSection) { return nullptr; }
 	virtual int GetBaseSlotCount() { return 0; }
 
 public:
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
index c810ad45..a3fb0d2d 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
@@ -16,13 +16,13 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentL
 
 	m_labelAnvil.init( app.GetString(IDS_REPAIR_AND_NAME) );
 
-	AnvilScreenInput *initData = (AnvilScreenInput *)_initData;
+	AnvilScreenInput *initData = static_cast<AnvilScreenInput *>(_initData);
 	m_inventory = initData->inventory;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Anvil_Menu, this);
 	}
@@ -96,6 +96,19 @@ void UIScene_AnvilMenu::tick()
 {
 	UIScene_AbstractContainerMenu::tick();
 
+#ifdef _WINDOWS64
+	// Live update: sync item name per-keystroke while editing (like Java edition)
+	if (m_textInputAnvil.isDirectEditing())
+	{
+		const wstring& buf = m_textInputAnvil.getEditBuffer();
+		if (buf != m_itemName)
+		{
+			m_itemName = buf;
+			updateItemName();
+		}
+	}
+#endif
+
 	handleTick();
 }
 
@@ -250,7 +263,7 @@ void UIScene_AnvilMenu::setSectionSelectedSlot(ESceneSection eSection, int x, in
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionAnvilItem1:
@@ -278,7 +291,7 @@ void UIScene_AnvilMenu::setSectionSelectedSlot(ESceneSection eSection, int x, in
 
 UIControl *UIScene_AnvilMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionAnvilItem1:
@@ -306,26 +319,67 @@ UIControl *UIScene_AnvilMenu::getSection(ESceneSection eSection)
 	return control;
 }
 
+#ifdef _WINDOWS64
+void UIScene_AnvilMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_textInputAnvil);
+}
+
+void UIScene_AnvilMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	m_itemName = input->getEditBuffer();
+	updateItemName();
+}
+#endif
+
 int UIScene_AnvilMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	// 4J HEG - No reason to set value if keyboard was cancelled
-	UIScene_AnvilMenu *pClass=(UIScene_AnvilMenu *)lpParam;
+	UIScene_AnvilMenu *pClass=static_cast<UIScene_AnvilMenu *>(lpParam);
 	pClass->setIgnoreInput(false);
 
 	if (bRes)
 	{
+#ifdef _WINDOWS64
+		uint16_t pchText[128];
+		ZeroMemory(pchText, 128 * sizeof(uint16_t));
+		Win64_GetKeyboardText(pchText, 128);
+		pClass->setEditNameValue(reinterpret_cast<wchar_t *>(pchText));
+		pClass->m_itemName = reinterpret_cast<wchar_t *>(pchText);
+		pClass->updateItemName();
+#else
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 		InputManager.GetText(pchText);
 		pClass->setEditNameValue((wchar_t *)pchText);
 		pClass->m_itemName = (wchar_t *)pchText;
 		pClass->updateItemName();
+#endif
 	}
 	return 0;
 }
 
 void UIScene_AnvilMenu::handleEditNamePressed()
 {
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking())
+		return;
+
+	if (g_KBMInput.IsKBMActive())
+	{
+		m_textInputAnvil.beginDirectEdit(30);
+	}
+	else
+	{
+		setIgnoreInput(true);
+		UIKeyboardInitData kbData;
+		kbData.title       = app.GetString(IDS_TITLE_RENAME);
+		kbData.defaultText = m_textInputAnvil.getLabel();
+		kbData.maxChars    = 30;
+		kbData.callback    = &UIScene_AnvilMenu::KeyboardCompleteCallback;
+		kbData.lpParam     = this;
+		ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+	}
+#else
 	setIgnoreInput(true);
 #if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
 	int language = XGetLanguage();
@@ -337,12 +391,12 @@ void UIScene_AnvilMenu::handleEditNamePressed()
 		InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),(DWORD)m_iPad,30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
 		break;
 	default:
-		// 4J Stu - Use a different keyboard for non-asian languages so we don't have prediction on
 		InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),(DWORD)m_iPad,30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Alphabet_Extended);
 		break;
 	}
 #else
-	InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),(DWORD)m_iPad,30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
+	InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),static_cast<DWORD>(m_iPad),30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
+#endif
 #endif
 }
 
@@ -357,6 +411,8 @@ void UIScene_AnvilMenu::setEditNameEditable(bool enabled)
 
 void UIScene_AnvilMenu::setCostLabel(const wstring &label, bool canAfford)
 {
+	if (!getMovie()) return;
+
 	IggyDataValue result;
 	IggyDataValue value[2];
 
@@ -375,6 +431,8 @@ void UIScene_AnvilMenu::showCross(bool show)
 {
 	if(m_showingCross != show)
 	{
+		if (!getMovie()) return;
+
 		IggyDataValue result;
 		IggyDataValue value[1];
 
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
index 3afc6333..44f75992 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
@@ -55,6 +55,10 @@ protected:
 
 	virtual UIControl *getSection(ESceneSection eSection);
 
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+#endif
 	static int KeyboardCompleteCallback(LPVOID lpParam,bool bRes);
 	virtual void handleEditNamePressed();
 	virtual void setEditNameValue(const wstring &name);
diff --git a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
index e70397d6..64e12373 100644
--- a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
@@ -21,12 +21,12 @@ UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void *_initData, UILayer *paren
 	m_buttonsPowers[eControl_Secondary1].setVisible(false);
 	m_buttonsPowers[eControl_Secondary2].setVisible(false);
 
-	BeaconScreenInput *initData = (BeaconScreenInput *)_initData;
+	BeaconScreenInput *initData = static_cast<BeaconScreenInput *>(_initData);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Beacon_Menu, this);
 	}
@@ -254,7 +254,7 @@ void UIScene_BeaconMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionBeaconItem:
@@ -276,7 +276,7 @@ void UIScene_BeaconMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 UIControl *UIScene_BeaconMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionBeaconItem:
@@ -324,11 +324,11 @@ UIControl *UIScene_BeaconMenu::getSection(ESceneSection eSection)
 void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 
 	if(slotId >= 0 && slotId >= m_menu->getSize() )
 	{			
@@ -336,22 +336,22 @@ void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		switch(icon)
 		{
 		case 0:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::emerald) );
+			item = std::make_shared<ItemInstance>(Item::emerald);
 			break;
 		case 1:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::diamond) );
+			item = std::make_shared<ItemInstance>(Item::diamond);
 			break;
 		case 2:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::goldIngot) );
+			item = std::make_shared<ItemInstance>(Item::goldIngot);
 			break;
 		case 3:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::ironIngot) );
+			item = std::make_shared<ItemInstance>(Item::ironIngot);
 			break;
 		default:
 			assert(false);
 			break;
 		};		
-		if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
+		if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
 	}
 	else
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
index 8563054c..129868fd 100644
--- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
@@ -14,15 +14,15 @@ UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UI
 	m_progressBrewingArrow.init(L"",0,0,PotionBrewing::BREWING_TIME_SECONDS * SharedConstants::TICKS_PER_SECOND,0);
 	m_progressBrewingBubbles.init(L"",0,0,30,0);
 
-	BrewingScreenInput *initData = (BrewingScreenInput *)_initData;
+	BrewingScreenInput *initData = static_cast<BrewingScreenInput *>(_initData);
 	m_brewingStand = initData->brewingStand;
 
 	m_labelBrewingStand.init( m_brewingStand->getName() );
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Brewing_Menu, this);
 	}
@@ -249,7 +249,7 @@ void UIScene_BrewingStandMenu::setSectionSelectedSlot(ESceneSection eSection, in
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionBrewingBottle1:
@@ -280,7 +280,7 @@ void UIScene_BrewingStandMenu::setSectionSelectedSlot(ESceneSection eSection, in
 
 UIControl *UIScene_BrewingStandMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionBrewingBottle1:
diff --git a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
index 968072a8..e10a5a62 100644
--- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
@@ -15,7 +15,7 @@ UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData
 	m_progressBar.setVisible( false );
 	m_labelTip.setVisible( false );
 
-	ConnectionProgressParams *param = (ConnectionProgressParams *)_initData;
+	ConnectionProgressParams *param = static_cast<ConnectionProgressParams *>(_initData);
 
 	if( param->stringId >= 0 )
 	{
@@ -210,7 +210,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 // 4J-PB - Removed the option to cancel join - it didn't work anyway
 // 		case ACTION_MENU_CANCEL:
 // 			{
-// 				if(m_cancelFunc != NULL)
+// 				if(m_cancelFunc != nullptr)
 // 				{
 // 					m_cancelFunc(m_cancelFuncParam);
 // 				}
@@ -245,7 +245,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 
 void UIScene_ConnectingProgress::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		if(m_showingButton)
diff --git a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
index 9e48a57b..b26ae48e 100644
--- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
@@ -13,7 +13,7 @@
 
 UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
 {
-	ContainerScreenInput *initData = (ContainerScreenInput *)_initData;
+	ContainerScreenInput *initData = static_cast<ContainerScreenInput *>(_initData);
 	m_bLargeChest = (initData->container->getContainerSize() > 3*9)?true:false;
 
 	// Setup all the Iggy references we need for this scene
@@ -24,9 +24,9 @@ UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer
 	ContainerMenu* menu = new ContainerMenu( initData->inventory, initData->container );
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Container_Menu, this);
 	}
@@ -181,7 +181,7 @@ void UIScene_ContainerMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionContainerChest:
@@ -203,7 +203,7 @@ void UIScene_ContainerMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_ContainerMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionContainerChest:
diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
index 57567248..939efde1 100644
--- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
@@ -13,7 +13,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *pa
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_number;
 #if defined(_XBOX) || defined(_WIN64)
-	value[0].number = (F64)0;
+	value[0].number = static_cast<F64>(0);
 #elif defined(_DURANGO)
 	value[0].number = (F64)1;
 #elif defined(__PS3__)
@@ -25,7 +25,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *pa
 #endif
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value );
 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	if(bNotInGame)
 	{
@@ -84,7 +84,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *pa
 		IggyDataValue result;
 		IggyDataValue value[1];
 		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = (F64)m_iCurrentNavigatedControlsLayout;
+		value[0].number = static_cast<F64>(m_iCurrentNavigatedControlsLayout);
 		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetControllerLayout , 1 , value );
 	}
 
@@ -180,7 +180,7 @@ void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, bool pres
 
 void UIScene_ControlsMenu::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_InvertLook:
 		app.SetGameSettings(m_iPad,eGameSetting_ControlInvertLook,(unsigned char)( selected ) );
@@ -194,13 +194,13 @@ void UIScene_ControlsMenu::handleCheckboxToggled(F64 controlId, bool selected)
 
 void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId)
 {
-	int control = (int)controlId;
+	int control = static_cast<int>(controlId);
 	switch(control)
 	{
 	case eControl_Button0:
 	case eControl_Button1:
 	case eControl_Button2:
-		app.SetGameSettings(m_iPad,eGameSetting_ControlScheme,(unsigned char)control);
+		app.SetGameSettings(m_iPad,eGameSetting_ControlScheme,static_cast<unsigned char>(control));
 		LPWSTR layoutString = new wchar_t[ 128 ];
 		swprintf( layoutString, 128, L"%ls : %ls", app.GetString( IDS_CURRENT_LAYOUT ),app.GetString(m_iSchemeTextA[control]));	
 #ifdef __ORBIS__
@@ -216,7 +216,7 @@ void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_ControlsMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-	int control = (int)controlId;
+	int control = static_cast<int>(controlId);
 	switch(control)
 	{
 	case eControl_Button0:
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
index 66d8c41e..16b63c4c 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
@@ -4,6 +4,9 @@
 #include "..\..\MultiplayerLocalPlayer.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"
+#ifdef _WINDOWS64
+#include "..\..\Windows64\Iggy\gdraw\gdraw_d3d11.h"
+#endif
 
 #ifdef __PSVITA__
 #define GAME_CRAFTING_TOUCHUPDATE_TIMER_ID 0
@@ -12,9 +15,14 @@
 
 UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
+#ifdef _WINDOWS64
+	m_hSlotBoundsValid = false;
+	m_hSlotX0 = m_hSlotY0 = m_hSlotY1 = 0;
+	m_hSlotSpacing = 0;
+#endif
 	m_bIgnoreKeyPresses = false;
 
-	CraftingPanelScreenInput* initData = (CraftingPanelScreenInput*)_initData;
+	CraftingPanelScreenInput* initData = static_cast<CraftingPanelScreenInput *>(_initData);
 	m_iContainerType=initData->iContainerType;
 	m_pPlayer=initData->player;
 	m_bSplitscreen=initData->bSplitscreen;
@@ -109,9 +117,9 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 	// Update the tutorial state
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		if(m_iContainerType==RECIPE_TYPE_2x2)
 		{
@@ -190,14 +198,14 @@ void UIScene_CraftingMenu::handleDestroy()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL && Minecraft::GetInstance()->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr && Minecraft::GetInstance()->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
 	{
 		Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	}
@@ -254,12 +262,14 @@ wstring UIScene_CraftingMenu::getMoviePath()
 	}
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 UIControl* UIScene_CraftingMenu::GetMainPanel()
 {
 	return &m_controlMainPanel;
 }
+#endif
 
+#ifdef __PSVITA__
 void UIScene_CraftingMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased)
 {
 	// perform action on release
@@ -383,6 +393,85 @@ void UIScene_CraftingMenu::handleTimerComplete(int id)
 }
 #endif
 
+#ifdef _WINDOWS64
+bool UIScene_CraftingMenu::handleMouseClick(F32 x, F32 y)
+{
+	if (!m_hSlotBoundsValid || m_hSlotSpacing <= 0)
+		return false;
+
+	// Tab click — tabs sit directly above the H slot row. We derive their
+	// bounds from the H slot positions cached in customDraw, since the Vita
+	// TouchPanel controls are full-screen overlays with unusable bounds.
+	int maxTabs = (m_iContainerType == RECIPE_TYPE_3x3) ? m_iMaxGroup3x3 : m_iMaxGroup2x2;
+	F32 slotHeight = m_hSlotY1 - m_hSlotY0;
+	F32 tabRowY0 = (m_hSlotY0 * 0.75f) - slotHeight * 1.55f;
+	F32 tabRowY1 = tabRowY0 + (slotHeight * 1.7f);
+	F32 tabRowWidth = m_hSlotSpacing * m_iCraftablesMaxHSlotC;
+	F32 tabWidth = tabRowWidth / maxTabs;
+
+	if (tabWidth > 0 && x >= m_hSlotX0 && x < m_hSlotX0 + tabRowWidth &&
+		y >= tabRowY0 && y < tabRowY1)
+	{
+		int iTab = (int)((x - m_hSlotX0) / tabWidth);
+		if (iTab >= 0 && iTab < maxTabs && iTab != m_iGroupIndex)
+		{
+			showTabHighlight(m_iGroupIndex, false);
+			m_iGroupIndex = iTab;
+			showTabHighlight(m_iGroupIndex, true);
+			m_iCurrentSlotHIndex = 0;
+			m_iCurrentSlotVIndex = 1;
+			CheckRecipesAvailable();
+			iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1;
+			iVSlotIndexA[1] = 0;
+			iVSlotIndexA[2] = 1;
+			ui.PlayUISFX(eSFX_Focus);
+			UpdateVerticalSlots();
+			UpdateHighlight();
+			setGroupText(GetGroupNameText(m_pGroupA[m_iGroupIndex]));
+		}
+		return true;
+	}
+
+	// H slot click — select or craft
+	F32 rowWidth = m_hSlotSpacing * m_iCraftablesMaxHSlotC;
+	if (x >= m_hSlotX0 && x < m_hSlotX0 + rowWidth &&
+		y >= m_hSlotY0 && y < m_hSlotY1)
+	{
+		int iNewSlot = (int)((x - m_hSlotX0) / m_hSlotSpacing);
+		if (iNewSlot >= 0 && iNewSlot < m_iCraftablesMaxHSlotC)
+		{
+			// Only interact with populated slots
+			if (CanBeMadeA[iNewSlot].iCount == 0)
+				return true;
+
+			if (iNewSlot == m_iCurrentSlotHIndex)
+			{
+				// Click on already-selected slot — craft the item
+				handleKeyDown(m_iPad, ACTION_MENU_A, false);
+			}
+			else
+			{
+				int iOldHSlot = m_iCurrentSlotHIndex;
+				m_iCurrentSlotHIndex = iNewSlot;
+				m_iCurrentSlotVIndex = 1;
+				iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1;
+				iVSlotIndexA[1] = 0;
+				iVSlotIndexA[2] = 1;
+				UpdateVerticalSlots();
+				UpdateHighlight();
+				if (CanBeMadeA[iOldHSlot].iCount > 0)
+					setShowCraftHSlot(iOldHSlot, true);
+				ui.PlayUISFX(eSFX_Focus);
+			}
+			return true;
+		}
+	}
+	// Consume all mouse clicks so misses don't generate ACTION_MENU_A
+	// and accidentally craft. Only blocks mouse-originated presses.
+	return true;
+}
+#endif
+
 void UIScene_CraftingMenu::handleReload()
 {
 	m_slotListInventory.addSlots(CRAFTING_INVENTORY_SLOT_START,CRAFTING_INVENTORY_SLOT_END - CRAFTING_INVENTORY_SLOT_START);
@@ -436,14 +525,14 @@ void UIScene_CraftingMenu::handleReload()
 void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
 	float alpha = 1.0f;
 	bool decorations = true;
 	bool inventoryItem = false;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 	if (slotId == -1)
 	{
 		app.DebugPrintf("This is not the control we are looking for\n");
@@ -471,17 +560,43 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_vSlotsInfo[iIndex].show)
 		{
 			item = m_vSlotsInfo[iIndex].item;
-			alpha = ((float)m_vSlotsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_vSlotsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId >= CRAFTING_H_SLOT_START && slotId < (CRAFTING_H_SLOT_START + m_iCraftablesMaxHSlotC) )
 	{
 		decorations = false;
 		int iIndex = slotId - CRAFTING_H_SLOT_START;
+#ifdef _WINDOWS64
+		// Cache H slot SWF-space positions from the custom draw transform matrix
+		if (iIndex == 0 || iIndex == 1)
+		{
+			F32 mat[16];
+			gdraw_D3D11_CalculateCustomDraw_4J(region, mat);
+			// Matrix to SWF coords (same formula as setupCustomDrawMatrices)
+			F32 sw = (F32)getRenderWidth();
+			F32 sh = (F32)getRenderHeight();
+			F32 swfX = sw * (1.0f + mat[3]) / 2.0f;
+			F32 swfY = sh * (1.0f - mat[7]) / 2.0f;
+			if (iIndex == 0)
+			{
+				m_hSlotX0 = swfX;
+				m_hSlotY0 = swfY;
+				// Slot visual height from matrix scale and region height
+				F32 slotH = sh * (-mat[5]) / 2.0f * region->y1;
+				m_hSlotY1 = swfY + slotH;
+			}
+			else
+			{
+				m_hSlotSpacing = swfX - m_hSlotX0;
+				m_hSlotBoundsValid = (m_hSlotSpacing > 0);
+			}
+		}
+#endif
 		if(m_hSlotsInfo[iIndex].show)
 		{
 			item = m_hSlotsInfo[iIndex].item;
-			alpha = ((float)m_hSlotsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_hSlotsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId >= CRAFTING_INGREDIENTS_LAYOUT_START && slotId < (CRAFTING_INGREDIENTS_LAYOUT_START + m_iIngredientsMaxSlotC) )
@@ -490,7 +605,7 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_ingredientsSlotsInfo[iIndex].show)
 		{
 			item = m_ingredientsSlotsInfo[iIndex].item;
-			alpha = ((float)m_ingredientsSlotsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_ingredientsSlotsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId >= CRAFTING_INGREDIENTS_DESCRIPTION_START && slotId < (CRAFTING_INGREDIENTS_DESCRIPTION_START + 4) )
@@ -499,7 +614,7 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_ingredientsInfo[iIndex].show)
 		{
 			item = m_ingredientsInfo[iIndex].item;
-			alpha = ((float)m_ingredientsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_ingredientsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId == CRAFTING_OUTPUT_SLOT_START )
@@ -507,11 +622,11 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_craftingOutputSlotInfo.show)
 		{
 			item = m_craftingOutputSlotInfo.item;
-			alpha = ((float)m_craftingOutputSlotInfo.alpha)/31.0f;
+			alpha = static_cast<float>(m_craftingOutputSlotInfo.alpha)/31.0f;
 		}
 	}
 
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		if(!inventoryItem)
 		{
@@ -627,7 +742,7 @@ void UIScene_CraftingMenu::setCraftingOutputSlotItem(int iPad, shared_ptr<ItemIn
 {
 	m_craftingOutputSlotInfo.item = item;
 	m_craftingOutputSlotInfo.alpha = 31;
-	m_craftingOutputSlotInfo.show = item != NULL;
+	m_craftingOutputSlotInfo.show = item != nullptr;
 }
 
 void UIScene_CraftingMenu::setCraftingOutputSlotRedBox(bool show)
@@ -639,7 +754,7 @@ void UIScene_CraftingMenu::setIngredientSlotItem(int iPad, int index, shared_ptr
 {
 	m_ingredientsSlotsInfo[index].item = item;
 	m_ingredientsSlotsInfo[index].alpha = 31;
-	m_ingredientsSlotsInfo[index].show = item != NULL;
+	m_ingredientsSlotsInfo[index].show = item != nullptr;
 }
 
 void UIScene_CraftingMenu::setIngredientSlotRedBox(int index, bool show)
@@ -651,7 +766,7 @@ void UIScene_CraftingMenu::setIngredientDescriptionItem(int iPad, int index, sha
 {
 	m_ingredientsInfo[index].item = item;
 	m_ingredientsInfo[index].alpha = 31;
-	m_ingredientsInfo[index].show = item != NULL;
+	m_ingredientsInfo[index].show = item != nullptr;
 
 	IggyDataValue result;
 	IggyDataValue value[2];
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h
index 84c9ba65..2f52b8ba 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h
@@ -66,10 +66,19 @@ public:
 
 #ifdef __PSVITA__
 	virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased);
-	virtual UIControl* GetMainPanel();
 	virtual void handleTouchBoxRebuild();
 	virtual void handleTimerComplete(int id);
 #endif
+#if defined(__PSVITA__) || defined(_WINDOWS64)
+	virtual UIControl* GetMainPanel();
+#endif
+#ifdef _WINDOWS64
+	virtual bool handleMouseClick(F32 x, F32 y);
+	// Cached from customDraw — H slot bounding boxes in SWF space
+	F32 m_hSlotX0, m_hSlotY0, m_hSlotY1;
+	F32 m_hSlotSpacing; // x distance between slot 0 and slot 1
+	bool m_hSlotBoundsValid;
+#endif
 
 protected:
 	UIControl m_controlMainPanel;
@@ -97,7 +106,7 @@ protected:
 		ETouchInput_TouchPanel_5,
 		ETouchInput_TouchPanel_6,
 		ETouchInput_CraftingHSlots,
-		
+
 		ETouchInput_Count,
 	};
 	UIControl_Touch m_TouchInput[ETouchInput_Count];
diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
index 2bd06bc6..ef72ec16 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
@@ -58,11 +58,11 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 	m_labelTexturePackDescription.init(L"");
 
 	WCHAR TempString[256];
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));	
+	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));
 	m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
 
 	m_MoreOptionsParams.bGenerateOptions=TRUE;
-	m_MoreOptionsParams.bStructures=TRUE;	
+	m_MoreOptionsParams.bStructures=TRUE;
 	m_MoreOptionsParams.bFlatWorld=FALSE;
 	m_MoreOptionsParams.bBonusChest=FALSE;
 	m_MoreOptionsParams.bPVP = TRUE;
@@ -82,12 +82,8 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 
 	m_bGameModeCreative = false;
 	m_iGameModeId = GameType::SURVIVAL->getId();
-	m_pDLCPack = NULL;
+	m_pDLCPack = nullptr;
 	m_bRebuildTouchBoxes = false;
-#ifdef _WINDOWS64
-	m_bDirectEditing = false;
-	m_iDirectEditCooldown = 0;
-#endif
 
 	m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
 	// 4J-PB - read the settings for the online flag. We'll only save this setting if the user changed it.
@@ -95,12 +91,12 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 	m_MoreOptionsParams.bOnlineSettingChangedBySystem=false;
 
 	// 4J-PB - Removing this so that we can attempt to create an online game on PS3 when we are a restricted child account
-	// It'll fail when we choose create, but this matches the behaviour of load game, and lets the player know why they can't play online, 
+	// It'll fail when we choose create, but this matches the behaviour of load game, and lets the player know why they can't play online,
 	// instead of just greying out the online setting in the More Options
 	// #ifdef __PS3__
 	// 	if(ProfileManager.IsSignedInLive( m_iPad ))
 	// 	{
-	// 		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&bChatRestricted,&bContentRestricted,NULL);
+	// 		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&bChatRestricted,&bContentRestricted,nullptr);
 	// 	}
 	// #endif
 
@@ -128,9 +124,9 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 		{
 			// The profile settings say Online, but either the player is offline, or they are not allowed to play online
 			m_MoreOptionsParams.bOnlineSettingChangedBySystem=true;
-		}	
+		}
 	}
-	
+
 	// Set up online game checkbox
 	bool bOnlineGame = m_MoreOptionsParams.bOnlineGame;
 	m_checkboxOnline.SetEnable(true);
@@ -188,7 +184,7 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 #if TO_BE_IMPLEMENTED
 		// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 
-		DLC_INFO *pDLCInfo=NULL;
+		DLC_INFO *pDLCInfo=nullptr;
 
 		// first pass - look to see if there are any that are not in the list
 		bool bTexturePackAlreadyListed;
@@ -293,54 +289,6 @@ void UIScene_CreateWorldMenu::tick()
 {
 	UIScene::tick();
 
-#ifdef _WINDOWS64
-	if (m_iDirectEditCooldown > 0)
-		m_iDirectEditCooldown--;
-
-	if (m_bDirectEditing)
-	{
-		wchar_t ch;
-		bool changed = false;
-		while (g_KBMInput.ConsumeChar(ch))
-		{
-			if (ch == 0x08) // backspace
-			{
-				if (!m_worldName.empty())
-				{
-					m_worldName.pop_back();
-					changed = true;
-				}
-			}
-			else if (ch == 0x0D) // enter - confirm
-			{
-				m_bDirectEditing = false;
-				m_iDirectEditCooldown = 4; // absorb the matching ACTION_MENU_OK that follows
-				m_editWorldName.setLabel(m_worldName.c_str());
-			}
-			else if ((int)m_worldName.length() < 25)
-			{
-				m_worldName += ch;
-				changed = true;
-			}
-		}
-
-		// Escape cancels and restores the original name
-		if (m_bDirectEditing && g_KBMInput.IsKeyPressed(VK_ESCAPE))
-		{
-			m_worldName = m_worldNameBeforeEdit;
-			m_bDirectEditing = false;
-			m_iDirectEditCooldown = 4;
-			m_editWorldName.setLabel(m_worldName.c_str());
-			m_buttonCreateWorld.setEnable(!m_worldName.empty());
-		}
-		else if (changed)
-		{
-			m_editWorldName.setLabel(m_worldName.c_str());
-			m_buttonCreateWorld.setEnable(!m_worldName.empty());
-		}
-	}
-#endif
-
 	if(m_iSetTexturePackDescription >= 0 )
 	{
 		UpdateTexturePackDescription( m_iSetTexturePackDescription );
@@ -393,7 +341,7 @@ int UIScene_CreateWorldMenu::ContinueOffline(void *pParam,int iPad,C4JStorage::E
 	UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam;
 
 	// results switched for this dialog
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		pClass->m_MoreOptionsParams.bOnlineGame=false;
 		pClass->checkStateAndStartGame();
@@ -403,11 +351,24 @@ int UIScene_CreateWorldMenu::ContinueOffline(void *pParam,int iPad,C4JStorage::E
 
 #endif
 
+#ifdef _WINDOWS64
+void UIScene_CreateWorldMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_editWorldName);
+}
+
+void UIScene_CreateWorldMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	m_worldName = input->getEditBuffer();
+	m_buttonCreateWorld.setEnable(!m_worldName.empty());
+}
+#endif
+
 void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if(m_bIgnoreInput) return;
 #ifdef _WINDOWS64
-	if (m_bDirectEditing || m_iDirectEditCooldown > 0) { handled = true; return; }
+	if (isDirectEditBlocking()) { handled = true; return; }
 #endif
 
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
@@ -431,7 +392,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
 		if ( pressed && controlHasFocus(m_checkboxOnline.getId()) && !m_checkboxOnline.IsEnabled() )
 		{
 			UINT uiIDA[1] = { IDS_CONFIRM_OK };
-			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad); 
+			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad);
 		}
 #endif
 
@@ -442,7 +403,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
 	case ACTION_MENU_OTHER_STICK_UP:
 	case ACTION_MENU_OTHER_STICK_DOWN:
 		sendInputToMovie(key, repeat, pressed, released);
-		
+
 		bool bOnlineGame = m_checkboxOnline.IsChecked();
 		if (m_MoreOptionsParams.bOnlineGame != bOnlineGame)
 		{
@@ -464,19 +425,19 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 {
 	if(m_bIgnoreInput) return;
 #ifdef _WINDOWS64
-	if (m_bDirectEditing || m_iDirectEditCooldown > 0) return;
+	if (isDirectEditBlocking()) return;
 #endif
 
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_EditWorldName:
 		{
 			m_bIgnoreInput=true;
 #ifdef _WINDOWS64
-			if (Win64_IsControllerConnected())
+			if (!g_KBMInput.IsKBMActive())
 			{
 				UIKeyboardInitData kbData;
 				kbData.title       = app.GetString(IDS_CREATE_NEW_WORLD);
@@ -488,11 +449,8 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 			}
 			else
 			{
-				// PC without controller: edit the name field directly in-place.
-				m_bIgnoreInput = false; // Don't block input - m_bDirectEditing is the guard
-				m_worldNameBeforeEdit = m_worldName;
-				m_bDirectEditing = true;
-				g_KBMInput.ClearCharBuffer();
+				m_bIgnoreInput = false;
+				m_editWorldName.beginDirectEdit(25);
 			}
 #else
 			InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD),m_editWorldName.getLabel(),(DWORD)0,25,&UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback,this,C_4JInput::EKeyboardMode_Default);
@@ -502,16 +460,20 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 	case eControl_GameModeToggle:
 		switch(m_iGameModeId)
 		{
-		case 0: // Survival
+		case 0: // Creative
 			m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
 			m_iGameModeId = GameType::CREATIVE->getId();
 			m_bGameModeCreative = true;
 			break;
-		case 1: // Creative
+		case 1: // Adventure
+			m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
+			m_iGameModeId = GameType::ADVENTURE->getId();
+			m_bGameModeCreative = false;
+			break;
+		case 2: // Survival 
 			m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
 			m_iGameModeId = GameType::SURVIVAL->getId();
 			m_bGameModeCreative = false;
-			break;
 		};
 		break;
 	case eControl_MoreOptions:
@@ -519,7 +481,7 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 		break;
 	case eControl_TexturePackList:
 		{
-			UpdateCurrentTexturePack((int)childId);
+			UpdateCurrentTexturePack(static_cast<int>(childId));
 		}
 		break;
 	case eControl_NewWorld:
@@ -565,7 +527,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 		// texture pack hasn't been set yet, so check what it will be
 		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 
-		if(pTexturePack==NULL)
+		if(pTexturePack==nullptr)
 		{
 #if TO_BE_IMPLEMENTED
 			// They've selected a texture pack they don't have yet
@@ -614,8 +576,8 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 	if(m_MoreOptionsParams.dwTexturePack!=0)
 	{
 		// texture pack hasn't been set yet, so check what it will be
-		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);		
-		DLCTexturePack *pDLCTexPack=(DLCTexturePack *)pTexturePack;
+		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
+		DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(pTexturePack);
 		m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();
 
 		// do we have a license?
@@ -643,7 +605,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 				DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_pDLCPack->getPurchaseOfferId());
 				ULONGLONG ullOfferID_Full;
 
-				if(pDLCInfo!=NULL)
+				if(pDLCInfo!=nullptr)
 				{
 					ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 				}
@@ -666,7 +628,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 				UINT uiIDA[2];
 				uiIDA[0]=IDS_CONFIRM_OK;
 				uiIDA[1]=IDS_CONFIRM_CANCEL;
-				ui.RequestAlertMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 2, m_iPad,&TrialTexturePackWarningReturned,this);	
+				ui.RequestAlertMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 2, m_iPad,&TrialTexturePackWarningReturned,this);
 #endif
 
 #if defined _XBOX_ONE || defined __ORBIS__
@@ -686,14 +648,14 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Difficulty:
 		m_sliderDifficulty.handleSliderMove(value);
 
 		app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));		
+		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));
 		m_sliderDifficulty.setLabel(TempString);
 		break;
 	}
@@ -740,7 +702,7 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 					m_MoreOptionsParams.bInviteOnly = FALSE;
 					m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
 				}
-				
+
 				m_checkboxOnline.SetEnable(bMultiplayerAllowed);
 				m_checkboxOnline.setChecked(m_MoreOptionsParams.bOnlineGame);
 
@@ -762,7 +724,7 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 				if(m_iConfigA[i]!=-1)
 				{
 					DWORD dwBytes=0;
-					PBYTE pbData=NULL;
+					PBYTE pbData=nullptr;
 					//app.DebugPrintf("Retrieving iConfig %d from TPD\n",m_iConfigA[i]);
 
 					app.GetTPD(m_iConfigA[i],&pbData,&dwBytes);
@@ -771,10 +733,10 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 					if(dwBytes > 0 && pbData)
 					{
 						DWORD dwImageBytes=0;
-						PBYTE pbImageData=NULL;
+						PBYTE pbImageData=nullptr;
 
 						app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes );
-						ListInfo.fEnabled = TRUE;	
+						ListInfo.fEnabled = TRUE;
 						ListInfo.iData = m_iConfigA[i];
 						HRESULT hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&ListInfo.hXuiBrush);
 						app.DebugPrintf("Adding texturepack  %d from TPD\n",m_iConfigA[i]);
@@ -801,7 +763,7 @@ void UIScene_CreateWorldMenu::handleGainFocus(bool navBack)
 
 int UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_CreateWorldMenu *pClass=(UIScene_CreateWorldMenu *)lpParam;
+	UIScene_CreateWorldMenu *pClass=static_cast<UIScene_CreateWorldMenu *>(lpParam);
 	pClass->m_bIgnoreInput=false;
 	// 4J HEG - No reason to set value if keyboard was cancelled
 	if (bRes)
@@ -832,7 +794,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 	bool isOnlineGame = m_MoreOptionsParams.bOnlineGame;
 	int iPadNotSignedInLive = -1;
 	bool isLocalMultiplayerAvailable = app.IsLocalMultiplayerAvailable();
-		
+
 	for(unsigned int i = 0; i < XUSER_MAX_COUNT; i++)
 	{
 		if (ProfileManager.IsSignedIn(i) && (i == primaryPad || isLocalMultiplayerAvailable))
@@ -884,7 +846,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 			ui.RequestErrorMessage(IDS_PRO_CURRENTLY_NOT_ONLINE_TITLE, IDS_PRO_PSNOFFLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad());
 		}
 		else
-		{		
+		{
 			// Not signed in to PSN
 			UINT uiIDA[1];
 			uiIDA[0] = IDS_CONFIRM_OK;
@@ -928,7 +890,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_OK;
-				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 				return;
 			}
 
@@ -940,7 +902,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 			SceNpCommerceDialogParam param;
 			sceNpCommerceDialogParamInitialize(&param);
 			param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-			param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
+			param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
 			param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 			iResult=sceNpCommerceDialogOpen(&param);
@@ -948,14 +910,14 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 // 			UINT uiIDA[2];
 // 			uiIDA[0]=IDS_PLAY_OFFLINE;
 // 			uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 			ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+// 			ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 			return;
 		}
 	}
 #endif
 
 	if(m_bGameModeCreative == true || m_MoreOptionsParams.bHostPrivileges == TRUE)
-	{			
+	{
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_CONFIRM_OK;
 		uiIDA[1]=IDS_CONFIRM_CANCEL;
@@ -988,7 +950,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 #if defined(__PS3__) || defined(__PSVITA__)
 		if(isOnlineGame && isSignedInLive)
 		{
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,nullptr,&bContentRestricted,nullptr);
 		}
 #endif
 
@@ -1017,7 +979,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return;
 				}
 
@@ -1028,14 +990,14 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				SceNpCommerceDialogParam param;
 				sceNpCommerceDialogParamInitialize(&param);
 				param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
+				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
 				param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 				iResult=sceNpCommerceDialogOpen(&param);
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 			}
 
 #endif
@@ -1077,7 +1039,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return;
 				}
 
@@ -1091,15 +1053,15 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				SceNpCommerceDialogParam param;
 				sceNpCommerceDialogParamInitialize(&param);
 				param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
-				param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus); 
+				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
+				param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 				iResult=sceNpCommerceDialogOpen(&param);
 
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 			}
 
 #endif
@@ -1109,7 +1071,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				if(isOnlineGame)
 				{
 					bool chatRestricted = false;
-					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 					if(chatRestricted)
 					{
 						ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1165,15 +1127,15 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 	// start the game
 	bool isFlat = (pClass->m_MoreOptionsParams.bFlatWorld==TRUE);
-	__int64 seedValue = 0;
+	int64_t seedValue = 0;
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->levelName = wWorldName;
 
 	if (wSeed.length() != 0)
 	{
-		__int64 value = 0;
-		unsigned int len = (unsigned int)wSeed.length();
+		int64_t value = 0;
+		unsigned int len = static_cast<unsigned int>(wSeed.length());
 
 		//Check if the input string contains a numerical value
 		bool isNumber = true;
@@ -1191,7 +1153,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 		//If the input string is a numerical value, convert it to a number
 		if( isNumber )
-			value = _fromString<__int64>(wSeed);
+			value = _fromString<int64_t>(wSeed);
 
 		//If the value is not 0 use it, otherwise use the algorithm from the java String.hashCode() function to hash it
 		if( value != 0 )
@@ -1211,7 +1173,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 
 	param->seed = seedValue;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->texturePackId = pClass->m_MoreOptionsParams.dwTexturePack;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -1235,7 +1197,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	app.SetGameHostOption(eGameHostOption_HostCanFly,pClass->m_MoreOptionsParams.bHostPrivileges);
 	app.SetGameHostOption(eGameHostOption_HostCanChangeHunger,pClass->m_MoreOptionsParams.bHostPrivileges);
 	app.SetGameHostOption(eGameHostOption_HostCanBeInvisible,pClass->m_MoreOptionsParams.bHostPrivileges );
-	
+
 	app.SetGameHostOption(eGameHostOption_MobGriefing, pClass->m_MoreOptionsParams.bMobGriefing);
 	app.SetGameHostOption(eGameHostOption_KeepInventory, pClass->m_MoreOptionsParams.bKeepInventory);
 	app.SetGameHostOption(eGameHostOption_DoMobSpawning, pClass->m_MoreOptionsParams.bDoMobSpawning);
@@ -1243,12 +1205,12 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	app.SetGameHostOption(eGameHostOption_DoTileDrops, pClass->m_MoreOptionsParams.bDoTileDrops);
 	app.SetGameHostOption(eGameHostOption_NaturalRegeneration, pClass->m_MoreOptionsParams.bNaturalRegeneration);
 	app.SetGameHostOption(eGameHostOption_DoDaylightCycle, pClass->m_MoreOptionsParams.bDoDaylightCycle);
-	
-	app.SetGameHostOption(eGameHostOption_WasntSaveOwner, false); 
+
+	app.SetGameHostOption(eGameHostOption_WasntSaveOwner, false);
 #ifdef _LARGE_WORLDS
 	app.SetGameHostOption(eGameHostOption_WorldSize, pClass->m_MoreOptionsParams.worldSize+1 );  // 0 is GAME_HOST_OPTION_WORLDSIZE_UNKNOWN
-	pClass->m_MoreOptionsParams.currentWorldSize = (EGameHostOptionWorldSize)(pClass->m_MoreOptionsParams.worldSize+1);
-	pClass->m_MoreOptionsParams.newWorldSize = (EGameHostOptionWorldSize)(pClass->m_MoreOptionsParams.worldSize+1);
+	pClass->m_MoreOptionsParams.currentWorldSize = static_cast<EGameHostOptionWorldSize>(pClass->m_MoreOptionsParams.worldSize + 1);
+	pClass->m_MoreOptionsParams.newWorldSize = static_cast<EGameHostOptionWorldSize>(pClass->m_MoreOptionsParams.worldSize + 1);
 #endif
 
 	g_NetworkManager.HostGame(dwLocalUsersMask,isClientSide,isPrivate,MINECRAFT_NET_MAX_PLAYERS,0);
@@ -1290,7 +1252,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave time
 	app.SetAutosaveTimerTime();
@@ -1308,7 +1270,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam;
+	UIScene_CreateWorldMenu* pClass = static_cast<UIScene_CreateWorldMenu *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -1407,7 +1369,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinu
 		}
 	}
 	else
-	{		
+	{
 		pClass->m_bIgnoreInput = false;
 	}
 	return 0;
@@ -1416,9 +1378,9 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinu
 
 int UIScene_CreateWorldMenu::ConfirmCreateReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam;
+	UIScene_CreateWorldMenu* pClass = static_cast<UIScene_CreateWorldMenu *>(pParam);
 
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 
@@ -1463,13 +1425,13 @@ int UIScene_CreateWorldMenu::ConfirmCreateReturned(void *pParam,int iPad,C4JStor
 				ui.RequestAlertMessage( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad());
 			}
 			else
-			{	
+			{
 #if defined( __ORBIS__) || defined(__PSVITA__)
 				bool isOnlineGame = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 				if(isOnlineGame)
 				{
 					bool chatRestricted = false;
-					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 					if(chatRestricted)
 					{
 						ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1493,7 +1455,7 @@ int UIScene_CreateWorldMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStor
     UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu *)pParam;
 	pClass->m_bIgnoreInput = false;
 
-    if(result==C4JStorage::EMessage_ResultAccept) 
+    if(result==C4JStorage::EMessage_ResultAccept)
     {
         SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_CreateWorldMenu::StartGame_SignInReturned, pClass, false, iPad);
     }
@@ -1505,28 +1467,28 @@ int UIScene_CreateWorldMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStor
 // {
 // 	int32_t iResult;
 // 	UIScene_CreateWorldMenu *pClass = (UIScene_CreateWorldMenu *)pParam;
-// 
+//
 // 	// continue offline, or upsell PS Plus?
-// 	if(result==C4JStorage::EMessage_ResultDecline) 
+// 	if(result==C4JStorage::EMessage_ResultDecline)
 // 	{
 // 		// upsell psplus
 // 		int32_t iResult=sceNpCommerceDialogInitialize();
-// 
+//
 // 		SceNpCommerceDialogParam param;
 // 		sceNpCommerceDialogParamInitialize(&param);
 // 		param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-// 		param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
+// 		param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
 // 		param.userId = ProfileManager.getUserID(pClass->m_iPad);
-// 
+//
 // 		iResult=sceNpCommerceDialogOpen(&param);
 // 	}
-// 	else if(result==C4JStorage::EMessage_ResultAccept) 
+// 	else if(result==C4JStorage::EMessage_ResultAccept)
 // 	{
 // 		// continue offline
 // 		pClass->m_MoreOptionsParams.bOnlineGame=false;
 // 		pClass->checkStateAndStartGame();
 // 	}
-// 
+//
 // 	pClass->m_bIgnoreInput=false;
 // 	return 0;
 // }
diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
index 13f38a3b..75bfe602 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
@@ -51,11 +51,6 @@ private:
 	DLCPack * m_pDLCPack;
 	bool m_bRebuildTouchBoxes;
 
-#ifdef _WINDOWS64
-	bool m_bDirectEditing;
-	wstring m_worldNameBeforeEdit;
-	int m_iDirectEditCooldown;
-#endif
 
 public:
 	UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer);
@@ -83,6 +78,10 @@ protected:
 public:
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+#endif
 
 private:
 	void StartSharedLaunchFlow();
diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
index 0895cdff..ba2cd845 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
@@ -19,9 +19,9 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void *_initData, UILayer *p
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	InventoryScreenInput *initData = (InventoryScreenInput *)_initData;
+	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(_initData);
 
-	shared_ptr<SimpleContainer> creativeContainer = shared_ptr<SimpleContainer>(new SimpleContainer( 0, L"", false, TabSpec::MAX_SIZE ));
+	shared_ptr<SimpleContainer> creativeContainer = std::make_shared<SimpleContainer>(0, L"", false, TabSpec::MAX_SIZE);
 	itemPickerMenu = new ItemPickerMenu(creativeContainer, initData->player->inventory);
 
 	Initialize( initData->iPad, itemPickerMenu, false, -1, eSectionInventoryCreativeUsing, eSectionInventoryCreativeMax, initData->bNavigateBack);
@@ -42,9 +42,9 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void *_initData, UILayer *p
 	}
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Creative_Inventory_Menu, this);
 	}
@@ -144,7 +144,7 @@ void UIScene_CreativeMenu::handleOtherClicked(int iPad, ESceneSection eSection,
 	case eSectionInventoryCreativeTab_6:
 	case eSectionInventoryCreativeTab_7:
 		{
-			ECreativeInventoryTabs tab = (ECreativeInventoryTabs)((int)eCreativeInventoryTab_BuildingBlocks + (int)eSection - (int)eSectionInventoryCreativeTab_0);
+			ECreativeInventoryTabs tab = static_cast<ECreativeInventoryTabs>((int)eCreativeInventoryTab_BuildingBlocks + (int)eSection - (int)eSectionInventoryCreativeTab_0);
 			if(tab != m_curTab)
 			{
 				switchTab(tab);
@@ -193,8 +193,8 @@ void UIScene_CreativeMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		// Fall through intentional
 	case VK_PAD_RSHOULDER:
 		{		
-			ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + dir);
-			if (tab < 0) tab = (ECreativeInventoryTabs)(eCreativeInventoryTab_COUNT - 1);
+			ECreativeInventoryTabs tab = static_cast<ECreativeInventoryTabs>(m_curTab + dir);
+			if (tab < 0) tab = static_cast<ECreativeInventoryTabs>(eCreativeInventoryTab_COUNT - 1);
 			if (tab >= eCreativeInventoryTab_COUNT) tab = eCreativeInventoryTab_BuildingBlocks;
 			switchTab(tab);
 			ui.PlayUISFX(eSFX_Focus);
@@ -220,7 +220,7 @@ void UIScene_CreativeMenu::updateTabHighlightAndText(ECreativeInventoryTabs tab)
 	IggyDataValue value[1];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)tab;
+	value[0].number = static_cast<F64>(tab);
 
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ) , m_funcSetActiveTab , 1 , value );
 
@@ -400,7 +400,7 @@ void UIScene_CreativeMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryCreativeSelector:
@@ -419,7 +419,7 @@ void UIScene_CreativeMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 UIControl *UIScene_CreativeMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryCreativeSelector:
@@ -468,10 +468,10 @@ void UIScene_CreativeMenu::updateScrollCurrentPage(int currentPage, int pageCoun
 	IggyDataValue value[2];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)pageCount;
+	value[0].number = static_cast<F64>(pageCount);
 
 	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = (F64)currentPage - 1;
+	value[1].number = static_cast<F64>(currentPage) - 1;
 
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ) , m_funcSetScrollBar , 2 , value );
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
index 75ddf92f..9900169c 100644
--- a/Minecraft.Client/Common/UI/UIScene_Credits.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
@@ -593,11 +593,11 @@ void UIScene_Credits::tick()
 		}
 
 		// Set up the new text element.
-		if(pDef->m_Text!=NULL) // 4J-PB - think the RAD logo ones aren't set up yet and are coming is as null
+		if(pDef->m_Text!=nullptr) // 4J-PB - think the RAD logo ones aren't set up yet and are coming is as null
 		{
 			if ( pDef->m_iStringID[0] == CREDIT_ICON )
 			{
-				addImage((ECreditIcons)pDef->m_iStringID[1]);
+				addImage(static_cast<ECreditIcons>(pDef->m_iStringID[1]));
 			}			
 			else // using additional translated string.
 			{
@@ -670,7 +670,7 @@ void UIScene_Credits::setNextLabel(const wstring &label, ECreditTextTypes size)
 	value[0].string16 = stringVal;
 
 	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = (int)size;
+	value[1].number = static_cast<int>(size);
 
 	value[2].type = IGGY_DATATYPE_boolean;
 	value[2].boolval = (m_iCurrDefIndex == (m_iNumTextDefs - 1));
@@ -684,7 +684,7 @@ void UIScene_Credits::addImage(ECreditIcons icon)
 	IggyDataValue value[2];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (int)icon;
+	value[0].number = static_cast<int>(icon);
 
 	value[1].type = IGGY_DATATYPE_boolean;
 	value[1].boolval = (m_iCurrDefIndex == (m_iNumTextDefs - 1));
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
index 77ffdffd..6d705765 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
@@ -121,11 +121,11 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 
 void UIScene_DLCMainMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_OffersList:
 		{
-			int iIndex = (int)childId;
+			int iIndex = static_cast<int>(childId);
 			DLCOffersParam *param = new DLCOffersParam();
 			param->iPad = m_iPad;
 
@@ -134,7 +134,7 @@ void UIScene_DLCMainMenu::handlePress(F64 controlId, F64 childId)
 
 			// Xbox One will have requested the marketplace content - there is only that type
 #ifndef _XBOX_ONE
-			app.AddDLCRequest((eDLCMarketplaceType)iIndex, true);
+			app.AddDLCRequest(static_cast<eDLCMarketplaceType>(iIndex), true);
 #endif
 			killTimer(PLAYER_ONLINE_TIMER_ID);
 			ui.NavigateToScene(m_iPad, eUIScene_DLCOffersMenu, param);
@@ -166,7 +166,7 @@ void UIScene_DLCMainMenu::handleTimerComplete(int id)
 
 int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam;
+	UIScene_DLCMainMenu* pClass = static_cast<UIScene_DLCMainMenu *>(pParam);
 
 #if defined __ORBIS__ || defined __PSVITA__
 	app.GetCommerce()->HidePsStoreIcon();
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index c109ed62..5e644803 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -16,12 +16,12 @@
 UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	m_bProductInfoShown=false;
-	DLCOffersParam *param=(DLCOffersParam *)initData;
+	DLCOffersParam *param=static_cast<DLCOffersParam *>(initData);
 	m_iProductInfoIndex=param->iType;
 	m_iCurrentDLC=0;
 	m_iTotalDLC=0;
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
-	m_pvProductInfo=NULL;
+	m_pvProductInfo=nullptr;
 #endif
 	m_bAddAllDLCButtons=true;
 
@@ -51,7 +51,7 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void *initData, UILayer *
 	}
 
 #ifdef _DURANGO
-	m_pNoImageFor_DLC = NULL;
+	m_pNoImageFor_DLC = nullptr;
 	// If we don't yet have this DLC, we need to display a timer
 	m_bDLCRequiredIsRetrieved=false;
 	m_bIgnorePress=true;
@@ -103,7 +103,7 @@ void UIScene_DLCOffersMenu::handleTimerComplete(int id)
 
 int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam;
+	UIScene_DLCOffersMenu* pClass = static_cast<UIScene_DLCOffersMenu *>(pParam);
 
 #if defined __ORBIS__ || defined __PSVITA__
 	app.GetCommerce()->HidePsStoreIcon();
@@ -217,7 +217,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
 
 void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_OffersList:
 		{
@@ -261,13 +261,13 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
 #endif // __PS3__
 #elif defined _XBOX_ONE
 			int iIndex = (int)childId;
-			StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,NULL,NULL);
+			StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,nullptr,nullptr);
 #else
-			int iIndex = (int)childId;
+			int iIndex = static_cast<int>(childId);
 
 			ULONGLONG ullIndexA[1];
 			ullIndexA[0]=StorageManager.GetOffer(iIndex).qwOfferID;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 #endif
 		}
 		break;
@@ -343,10 +343,10 @@ void UIScene_DLCOffersMenu::tick()
 		{
 			m_bAddAllDLCButtons=false;
 			// add the categories to the list box
-			if(m_pvProductInfo==NULL)
+			if(m_pvProductInfo==nullptr)
 			{
 				m_pvProductInfo=app.GetProductList(m_iProductInfoIndex);
-				if(m_pvProductInfo==NULL)
+				if(m_pvProductInfo==nullptr)
 				{
 					m_iTotalDLC=0;
 					// need to display text to say no downloadable content available yet
@@ -690,7 +690,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 			// Check that this is in the list of known DLC
 			DLC_INFO *pDLC=app.GetDLCInfoForFullOfferID(xOffer.wszProductID);
 
-			if(pDLC!=NULL)
+			if(pDLC!=nullptr)
 			{
 				OrderA[uiDLCCount].uiContentIndex=i;
 				OrderA[uiDLCCount++].uiSortIndex=pDLC->uiSortIndex;
@@ -710,7 +710,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 			// Check that this is in the list of known DLC
 			DLC_INFO *pDLC=app.GetDLCInfoForFullOfferID(xOffer.wszProductID);
 
-			if(pDLC==NULL)
+			if(pDLC==nullptr)
 			{
 				// skip this one
 				app.DebugPrintf("Unknown offer - %ls\n",xOffer.wszOfferName);
@@ -736,7 +736,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 				// find the DLC in the installed packages
 				XCONTENT_DATA *pContentData=StorageManager.GetInstalledDLC(xOffer.wszProductID);
 
-				if(pContentData!=NULL)
+				if(pContentData!=nullptr)
 				{
 					m_buttonListOffers.addItem(wstrTemp,!pContentData->bTrialLicense,OrderA[i].uiContentIndex);
 				}
@@ -809,7 +809,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
 	DLC_INFO *dlc = app.GetDLCInfoForFullOfferID(xOffer.wszOfferName);
 #endif
 
-	if (dlc != NULL)
+	if (dlc != nullptr)
 	{
 		WCHAR *cString = dlc->wchBanner;
 
@@ -844,7 +844,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
 			{
 				if(hasRegisteredSubstitutionTexture(cString)==false)
 				{
-					BYTE *pData=NULL;
+					BYTE *pData=nullptr;
 					DWORD dwSize=0;
 					app.GetMemFileDetails(cString,&pData,&dwSize);
 					// set the image
diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
index 8f0f4c11..a4dbe8a8 100644
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -18,9 +18,9 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLa
 	m_bIgnoreInput = false;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(false);
@@ -30,9 +30,9 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLa
 UIScene_DeathMenu::~UIScene_DeathMenu()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(true);
@@ -81,7 +81,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 
 void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Respawn:
 		m_bIgnoreInput = true;
@@ -104,9 +104,9 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 				{
 					UINT uiIDA[3];
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Failed);
 					
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
index 2a8ac9f8..d698b51f 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
@@ -41,8 +41,72 @@ wstring UIScene_DebugCreateSchematic::getMoviePath()
 	return L"DebugCreateSchematic";
 }
 
+UIControl_TextInput* UIScene_DebugCreateSchematic::getTextInputForControl(eControls ctrl)
+{
+	switch (ctrl)
+	{
+	case eControl_Name:   return &m_textInputName;
+	case eControl_StartX: return &m_textInputStartX;
+	case eControl_StartY: return &m_textInputStartY;
+	case eControl_StartZ: return &m_textInputStartZ;
+	case eControl_EndX:   return &m_textInputEndX;
+	case eControl_EndY:   return &m_textInputEndY;
+	case eControl_EndZ:   return &m_textInputEndZ;
+	default: return NULL;
+	}
+}
+
+#ifdef _WINDOWS64
+void UIScene_DebugCreateSchematic::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_textInputName);
+	inputs.push_back(&m_textInputStartX);
+	inputs.push_back(&m_textInputStartY);
+	inputs.push_back(&m_textInputStartZ);
+	inputs.push_back(&m_textInputEndX);
+	inputs.push_back(&m_textInputEndY);
+	inputs.push_back(&m_textInputEndZ);
+}
+
+void UIScene_DebugCreateSchematic::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	wstring value = input->getEditBuffer();
+	int iVal = 0;
+	if (!value.empty())
+		iVal = _fromString<int>(value);
+
+	if (input == &m_textInputName)
+	{
+		if (!value.empty())
+			swprintf(m_data->name, 64, L"%ls", value.c_str());
+		else
+			swprintf(m_data->name, 64, L"schematic");
+	}
+	else if (input == &m_textInputStartX) m_data->startX = iVal;
+	else if (input == &m_textInputStartY) m_data->startY = iVal;
+	else if (input == &m_textInputStartZ) m_data->startZ = iVal;
+	else if (input == &m_textInputEndX)   m_data->endX = iVal;
+	else if (input == &m_textInputEndY)   m_data->endY = iVal;
+	else if (input == &m_textInputEndZ)   m_data->endZ = iVal;
+}
+
+bool UIScene_DebugCreateSchematic::handleMouseClick(F32 x, F32 y)
+{
+	UIScene::handleMouseClick(x, y);
+	return true; // always consume to prevent Iggy re-entry on empty space
+}
+#endif
+
+void UIScene_DebugCreateSchematic::tick()
+{
+	UIScene::tick();
+}
+
 void UIScene_DebugCreateSchematic::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
 	switch(key)
@@ -67,60 +131,97 @@ void UIScene_DebugCreateSchematic::handleInput(int iPad, int key, bool repeat, b
 
 void UIScene_DebugCreateSchematic::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
-	{
-	case eControl_Create:
-		{
-			// We want the start to be even
-			if(m_data->startX > 0 && m_data->startX%2 != 0)
-				m_data->startX-=1;
-			else if(m_data->startX < 0 && m_data->startX%2 !=0)
-				m_data->startX-=1;
-			if(m_data->startY < 0) m_data->startY = 0;
-			else if(m_data->startY > 0 && m_data->startY%2 != 0)
-				m_data->startY-=1;
-			if(m_data->startZ > 0 && m_data->startZ%2 != 0)
-				m_data->startZ-=1;
-			else if(m_data->startZ < 0 && m_data->startZ%2 !=0)
-				m_data->startZ-=1;
-
-			// We want the end to be odd to have a total size that is even
-			if(m_data->endX > 0 && m_data->endX%2 == 0)
-				m_data->endX+=1;
-			else if(m_data->endX < 0 && m_data->endX%2 ==0)
-				m_data->endX+=1;
-			if(m_data->endY > Level::maxBuildHeight)
-				m_data->endY = Level::maxBuildHeight;
-			else if(m_data->endY > 0 && m_data->endY%2 == 0)
-				m_data->endY+=1;
-			else if(m_data->endY < 0 && m_data->endY%2 ==0)
-				m_data->endY+=1;
-			if(m_data->endZ > 0 && m_data->endZ%2 == 0)
-				m_data->endZ+=1;
-			else if(m_data->endZ < 0 && m_data->endZ%2 ==0)
-				m_data->endZ+=1;
-
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, (void *)m_data);
+#ifdef _WINDOWS64
+    if (isDirectEditBlocking())
+        return;
+#endif
 
-			navigateBack();
-		}
-		break;
-	case eControl_Name:
-	case eControl_StartX:
-	case eControl_StartY:
-	case eControl_StartZ:
-	case eControl_EndX:
-	case eControl_EndY:
-	case eControl_EndZ:
-		m_keyboardCallbackControl = (eControls)((int)controlId);	
-		InputManager.RequestKeyboard(L"Enter something",L"",(DWORD)0,25,&UIScene_DebugCreateSchematic::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
-		break;
-	};
+    switch (static_cast<int>(controlId))
+    {
+    case eControl_Create:
+        {
+            // We want the start to be even
+            if (m_data->startX > 0 && m_data->startX % 2 != 0)
+                m_data->startX -= 1;
+            else if (m_data->startX < 0 && m_data->startX % 2 != 0)
+                m_data->startX -= 1;
+
+            if (m_data->startY < 0)
+                m_data->startY = 0;
+            else if (m_data->startY > 0 && m_data->startY % 2 != 0)
+                m_data->startY -= 1;
+
+            if (m_data->startZ > 0 && m_data->startZ % 2 != 0)
+                m_data->startZ -= 1;
+            else if (m_data->startZ < 0 && m_data->startZ % 2 != 0)
+                m_data->startZ -= 1;
+
+            // We want the end to be odd to have a total size that is even
+            if (m_data->endX > 0 && m_data->endX % 2 == 0)
+                m_data->endX += 1;
+            else if (m_data->endX < 0 && m_data->endX % 2 == 0)
+                m_data->endX += 1;
+
+            if (m_data->endY > Level::maxBuildHeight)
+                m_data->endY = Level::maxBuildHeight;
+            else if (m_data->endY > 0 && m_data->endY % 2 == 0)
+                m_data->endY += 1;
+            else if (m_data->endY < 0 && m_data->endY % 2 == 0)
+                m_data->endY += 1;
+
+            if (m_data->endZ > 0 && m_data->endZ % 2 == 0)
+                m_data->endZ += 1;
+            else if (m_data->endZ < 0 && m_data->endZ % 2 == 0)
+                m_data->endZ += 1;
+
+            app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, static_cast<void*>(m_data));
+            navigateBack();
+        }
+        break;
+
+    case eControl_Name:
+    case eControl_StartX:
+    case eControl_StartY:
+    case eControl_StartZ:
+    case eControl_EndX:
+    case eControl_EndY:
+    case eControl_EndZ:
+        {
+            m_keyboardCallbackControl = static_cast<eControls>(static_cast<int>(controlId));
+#ifdef _WINDOWS64
+            if (g_KBMInput.IsKBMActive())
+            {
+                UIControl_TextInput* input = getTextInputForControl(m_keyboardCallbackControl);
+                if (input) input->beginDirectEdit(25);
+            }
+            else
+            {
+                UIKeyboardInitData kbData;
+                kbData.title       = L"Enter something";
+                kbData.defaultText = L"";
+                kbData.maxChars    = 25;
+                kbData.callback    = &UIScene_DebugCreateSchematic::KeyboardCompleteCallback;
+                kbData.lpParam     = this;
+                ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+            }
+#else
+            InputManager.RequestKeyboard(
+                L"Enter something",
+                L"",
+                static_cast<DWORD>(0),
+                25,
+                &UIScene_DebugCreateSchematic::KeyboardCompleteCallback,
+                this,
+                C_4JInput::EKeyboardMode_Default);
+#endif
+        }
+        break;
+    }
 }
 
 void UIScene_DebugCreateSchematic::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_SaveMobs:
 		m_data->bSaveMobs = selected;
@@ -136,11 +237,17 @@ void UIScene_DebugCreateSchematic::handleCheckboxToggled(F64 controlId, bool sel
 
 int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_DebugCreateSchematic *pClass=(UIScene_DebugCreateSchematic *)lpParam;
+	UIScene_DebugCreateSchematic *pClass=static_cast<UIScene_DebugCreateSchematic *>(lpParam);
 
+#ifdef _WINDOWS64
+	uint16_t pchText[128];
+	ZeroMemory(pchText, 128 * sizeof(uint16_t));
+	Win64_GetKeyboardText(pchText, 128);
+#else
 	uint16_t pchText[128];
 	ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 	InputManager.GetText(pchText);
+#endif
 
 	if(pchText[0]!=0)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
index cbfe785d..e18d9f5d 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
@@ -24,6 +24,7 @@ private:
 
 	ConsoleSchematicFile::XboxSchematicInitParam *m_data;
 
+
 public:
 	UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer);
 
@@ -58,8 +59,14 @@ protected:
 	UI_END_MAP_ELEMENTS_AND_NAMES()
 
 	virtual wstring getMoviePath();
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
 
 public:
+	virtual void tick();
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
 
@@ -68,6 +75,7 @@ protected:
 	virtual void handleCheckboxToggled(F64 controlId, bool selected);
 
 private:
+	UIControl_TextInput* getTextInputForControl(eControls ctrl);
 	static int KeyboardCompleteCallback(LPVOID lpParam,const bool bRes);
 };
 #endif
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
index af86d4b8..c997fb31 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
@@ -21,14 +21,16 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *pa
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	WCHAR TempString[256];
-	swprintf( (WCHAR *)TempString, 256, L"Set fov (%d)", (int)pMinecraft->gameRenderer->GetFovVal());
-	m_sliderFov.init(TempString,eControl_FOV,0,100,(int)pMinecraft->gameRenderer->GetFovVal());
+	const Minecraft *pMinecraft = Minecraft::GetInstance();
+	WCHAR tempString[256];
+	const int fovSliderVal = app.GetGameSettings(m_iPad, eGameSetting_FOV);
+	const int fovDeg = 70 + fovSliderVal * 40 / 100;
+	swprintf( tempString, 256, L"Set fov (%d)", fovDeg);
+	m_sliderFov.init(tempString,eControl_FOV,0,100,fovSliderVal);
 
-	float currentTime = pMinecraft->level->getLevelData()->getGameTime() % 24000;
-	swprintf( (WCHAR *)TempString, 256, L"Set time (unsafe) (%d)", (int)currentTime);
-	m_sliderTime.init(TempString,eControl_Time,0,240,currentTime/100);
+	const float currentTime = pMinecraft->level->getLevelData()->getGameTime() % 24000;
+	swprintf( tempString, 256, L"Set time (unsafe) (%d)", static_cast<int>(currentTime));
+	m_sliderTime.init(tempString,eControl_Time,0,240,currentTime/100);
 
 	m_buttonRain.init(L"Toggle Rain",eControl_Rain);
 	m_buttonThunder.init(L"Toggle Thunder",eControl_Thunder);
@@ -44,7 +46,7 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *pa
     std::vector<std::pair<std::wstring, unsigned int>> sortedItems;
     for (size_t i = 0; i < Item::items.length; ++i)
     {
-        if (Item::items[i] != NULL)
+        if (Item::items[i] != nullptr)
         {
 			sortedItems.emplace_back(std::wstring(app.GetString(Item::items[i]->getDescriptionId())), i);
         }
@@ -136,19 +138,19 @@ wstring UIScene_DebugOverlay::getMoviePath()
 
 void UIScene_DebugOverlay::customDraw(IggyCustomDrawCallbackRegion *region)
 {
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	const Minecraft *pMinecraft = Minecraft::GetInstance();
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	int itemId = -1;
-	swscanf((wchar_t*)region->name,L"item_%d",&itemId);
-	if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == NULL)
+	swscanf(static_cast<wchar_t *>(region->name),L"item_%d",&itemId);
+	if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == nullptr)
 	{
 		app.DebugPrintf("This is not the control we are looking for\n");
 	}
 	else
 	{
-		shared_ptr<ItemInstance> item = shared_ptr<ItemInstance>( new ItemInstance(itemId,1,0) );
-		if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,false,false);
+		const auto item = std::make_shared<ItemInstance>(itemId, 1, 0);
+		if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,false,false);
 	}
 }
 
@@ -181,7 +183,7 @@ void UIScene_DebugOverlay::handleInput(int iPad, int key, bool repeat, bool pres
 
 void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Items:
 		{
@@ -211,14 +213,14 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 	case eControl_Schematic:
 		{
 #ifndef _CONTENT_PACKAGE
-			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugCreateSchematic,NULL,eUILayer_Debug);
+			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugCreateSchematic,nullptr,eUILayer_Debug);
 #endif
 		}
 		break;
 	case eControl_SetCamera:
 		{
 #ifndef _CONTENT_PACKAGE
-			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugSetCamera,NULL,eUILayer_Debug);
+			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugSetCamera,nullptr,eUILayer_Debug);
 #endif
 		}
 		break;
@@ -252,7 +254,7 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 
 void UIScene_DebugOverlay::handleSliderMove(F64 sliderId, F64 currentValue)
 {
-	switch((int)sliderId)
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Time:
 		{
@@ -264,20 +266,25 @@ void UIScene_DebugOverlay::handleSliderMove(F64 sliderId, F64 currentValue)
 			MinecraftServer::SetTime(currentValue * 100);
 			pMinecraft->level->getLevelData()->setGameTime(currentValue * 100);
 
-			WCHAR TempString[256];
+			WCHAR tempString[256];
 			float currentTime = currentValue * 100;
-			swprintf( (WCHAR *)TempString, 256, L"Set time (unsafe) (%d)", (int)currentTime);
-			m_sliderTime.setLabel(TempString);
+			swprintf( tempString, 256, L"Set time (unsafe) (%d)", static_cast<int>(currentTime));
+			m_sliderTime.setLabel(tempString);
 		}
 		break;
 	case eControl_FOV:
 		{
 			Minecraft *pMinecraft = Minecraft::GetInstance();
-			pMinecraft->gameRenderer->SetFovVal((float)currentValue);
+			int v = static_cast<int>(currentValue);
+			if (v < 0) v = 0;
+			if (v > 100) v = 100;
+			int fovDeg = 70 + v * 40 / 100;
+			pMinecraft->gameRenderer->SetFovVal(static_cast<float>(fovDeg));
+			app.SetGameSettings(m_iPad, eGameSetting_FOV, v);
 
-			WCHAR TempString[256];
-			swprintf( (WCHAR *)TempString, 256, L"Set fov (%d)", (int)currentValue);
-			m_sliderFov.setLabel(TempString);
+			WCHAR tempString[256];
+			swprintf( tempString, 256, L"Set fov (%d)", fovDeg);
+			m_sliderFov.setLabel(tempString);
 		}
 		break;
 	};
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
index dd5a429f..51eab5aa 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
@@ -17,7 +17,7 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer
 	currentPosition->player = playerNo;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if (pMinecraft != NULL)
+	if (pMinecraft != nullptr)
 	{
 		Vec3 *vec = pMinecraft->localplayers[playerNo]->getPos(1.0);
 
@@ -31,19 +31,19 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer
 
 	WCHAR TempString[256];
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_camX);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_camX);
 	m_textInputX.init(TempString, eControl_CamX);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_camY);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_camY);
 	m_textInputY.init(TempString, eControl_CamY);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_camZ);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_camZ);
 	m_textInputZ.init(TempString, eControl_CamZ);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_yRot);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_yRot);
 	m_textInputYRot.init(TempString, eControl_YRot);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_elev);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_elev);
 	m_textInputElevation.init(TempString, eControl_Elevation);
 
 	m_checkboxLockPlayer.init(L"Lock Player", eControl_LockPlayer, app.GetFreezePlayers());
@@ -55,6 +55,7 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer
 	m_labelCamY.init(L"CamY");
 	m_labelCamZ.init(L"CamZ");
 	m_labelYRotElev.init(L"Y-Rot & Elevation (Degs)");
+
 }
 
 wstring UIScene_DebugSetCamera::getMoviePath()
@@ -62,8 +63,59 @@ wstring UIScene_DebugSetCamera::getMoviePath()
 	return L"DebugSetCamera";
 }
 
+#ifdef _WINDOWS64
+UIControl_TextInput* UIScene_DebugSetCamera::getTextInputForControl(eControls ctrl)
+{
+	switch (ctrl)
+	{
+	case eControl_CamX:      return &m_textInputX;
+	case eControl_CamY:      return &m_textInputY;
+	case eControl_CamZ:      return &m_textInputZ;
+	case eControl_YRot:      return &m_textInputYRot;
+	case eControl_Elevation: return &m_textInputElevation;
+	default: return NULL;
+	}
+}
+
+void UIScene_DebugSetCamera::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_textInputX);
+	inputs.push_back(&m_textInputY);
+	inputs.push_back(&m_textInputZ);
+	inputs.push_back(&m_textInputYRot);
+	inputs.push_back(&m_textInputElevation);
+}
+
+void UIScene_DebugSetCamera::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	wstring value = input->getEditBuffer();
+	double val = 0;
+	if (!value.empty()) val = _fromString<double>(value);
+
+	if (input == &m_textInputX)           currentPosition->m_camX = val;
+	else if (input == &m_textInputY)      currentPosition->m_camY = val;
+	else if (input == &m_textInputZ)      currentPosition->m_camZ = val;
+	else if (input == &m_textInputYRot)   currentPosition->m_yRot = val;
+	else if (input == &m_textInputElevation) currentPosition->m_elev = val;
+}
+
+bool UIScene_DebugSetCamera::handleMouseClick(F32 x, F32 y)
+{
+	UIScene::handleMouseClick(x, y);
+	return true; // always consume to prevent Iggy re-entry on empty space
+}
+#endif
+
+void UIScene_DebugSetCamera::tick()
+{
+	UIScene::tick();
+}
+
 void UIScene_DebugSetCamera::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) { handled = true; return; }
+#endif
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
 	switch(key)
@@ -88,11 +140,14 @@ void UIScene_DebugSetCamera::handleInput(int iPad, int key, bool repeat, bool pr
 
 void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Teleport:
 		app.SetXuiServerAction(	ProfileManager.GetPrimaryPad(),
-			eXuiServerAction_SetCameraLocation, 
+			eXuiServerAction_SetCameraLocation,
 			(void *)currentPosition);
 		break;
 	case eControl_CamX:
@@ -100,15 +155,34 @@ void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId)
 	case eControl_CamZ:
 	case eControl_YRot:
 	case eControl_Elevation:
-		m_keyboardCallbackControl = (eControls)((int)controlId);	
+		m_keyboardCallbackControl = static_cast<eControls>(static_cast<int>(controlId));
+#ifdef _WINDOWS64
+		if (g_KBMInput.IsKBMActive())
+		{
+			UIControl_TextInput* input = getTextInputForControl(m_keyboardCallbackControl);
+			if (input) input->beginDirectEdit(25);
+		}
+		else
+		{
+			UIKeyboardInitData kbData;
+			kbData.title       = L"Enter value";
+			kbData.defaultText = L"";
+			kbData.maxChars    = 25;
+			kbData.callback    = &UIScene_DebugSetCamera::KeyboardCompleteCallback;
+			kbData.lpParam     = this;
+			ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+		}
+#else
+>>>>>>> origin/main
 		InputManager.RequestKeyboard(L"Enter something",L"",(DWORD)0,25,&UIScene_DebugSetCamera::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
+#endif
 		break;
 	};
 }
 
 void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_LockPlayer:
 		app.SetFreezePlayers(selected);
@@ -118,14 +192,19 @@ void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, bool selected)
 
 int UIScene_DebugSetCamera::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_DebugSetCamera *pClass=(UIScene_DebugSetCamera *)lpParam;
-	uint16_t pchText[2048];//[128];
-	ZeroMemory(pchText, 2048/*128*/ * sizeof(uint16_t) );
+	UIScene_DebugSetCamera *pClass=static_cast<UIScene_DebugSetCamera *>(lpParam);
+	uint16_t pchText[2048];
+	ZeroMemory(pchText, 2048 * sizeof(uint16_t));
+#ifdef _WINDOWS64
+	Win64_GetKeyboardText(pchText, 2048);
+#else
+>>>>>>> origin/main
 	InputManager.GetText(pchText);
+#endif
 
 	if(pchText[0]!=0)
 	{
-		wstring value = (wchar_t *)pchText;
+		wstring value = reinterpret_cast<wchar_t*>(pchText);
 		double val = 0; 
 		if(!value.empty()) val = _fromString<double>( value );
 		switch(pClass->m_keyboardCallbackControl)
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h
index 38db1258..d758e049 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h
@@ -26,6 +26,9 @@ private:
 	FreezePlayerParam *fpp;
 
 	eControls m_keyboardCallbackControl;
+#ifdef _WINDOWS64
+	UIControl_TextInput* getTextInputForControl(eControls ctrl);
+#endif
 
 public:
 	UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer);
@@ -54,6 +57,12 @@ protected:
 	UI_END_MAP_ELEMENTS_AND_NAMES()
 
 	virtual wstring getMoviePath();
+	virtual void tick();
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
 
 public:
 	// INPUT
diff --git a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
index 97cf842a..2e47dda4 100644
--- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
@@ -10,14 +10,14 @@ UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	TrapScreenInput *initData = (TrapScreenInput *)_initData;
+	TrapScreenInput *initData = static_cast<TrapScreenInput *>(_initData);
 
 	m_labelDispenser.init(initData->trap->getName());
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trap_Menu, this);
 	}
@@ -156,7 +156,7 @@ void UIScene_DispenserMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionTrapTrap:
@@ -177,7 +177,7 @@ void UIScene_DispenserMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_DispenserMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionTrapTrap:
diff --git a/Minecraft.Client/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
index 3177344d..41195621 100644
--- a/Minecraft.Client/Common/UI/UIScene_EULA.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
@@ -48,8 +48,8 @@ UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIS
 #endif
 
 	vector<wstring> paragraphs;
-	int lastIndex = 0;
-	for (	int index = EULA.find(L"\r\n", lastIndex, 2);
+	size_t lastIndex = 0;
+	for (	size_t index = EULA.find(L"\r\n", lastIndex, 2);
 			index != wstring::npos; 
 			index = EULA.find(L"\r\n", lastIndex, 2)
 		)
@@ -132,7 +132,7 @@ void UIScene_EULA::handleInput(int iPad, int key, bool repeat, bool pressed, boo
 
 void UIScene_EULA::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		//CD - Added for audio
diff --git a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
index 27459ccc..f90c4b12 100644
--- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
@@ -14,14 +14,14 @@ UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILaye
 	m_enchantButton[1].init(1);
 	m_enchantButton[2].init(2);
 
-	EnchantingScreenInput *initData = (EnchantingScreenInput *)_initData;
+	EnchantingScreenInput *initData = static_cast<EnchantingScreenInput *>(_initData);
 	
 	m_labelEnchant.init( initData->name.empty() ? app.GetString(IDS_ENCHANT) : initData->name );
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Enchanting_Menu, this);
 	}
@@ -194,7 +194,7 @@ void UIScene_EnchantingMenu::setSectionSelectedSlot(ESceneSection eSection, int
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionEnchantSlot:
@@ -216,7 +216,7 @@ void UIScene_EnchantingMenu::setSectionSelectedSlot(ESceneSection eSection, int
 
 UIControl *UIScene_EnchantingMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionEnchantSlot:
@@ -247,7 +247,7 @@ UIControl *UIScene_EnchantingMenu::getSection(ESceneSection eSection)
 void UIScene_EnchantingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 	
 
 	if(wcscmp((wchar_t *)region->name,L"EnchantmentBook")==0)
@@ -264,7 +264,7 @@ void UIScene_EnchantingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 	else
 	{
 		int slotId = -1;
-		swscanf((wchar_t*)region->name,L"slot_Button%d",&slotId);
+		swscanf(static_cast<wchar_t *>(region->name),L"slot_Button%d",&slotId);
 		if(slotId >= 0)
 		{
 			// Setup GDraw, normal game render states and matrices
diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
index 2f43cada..5b10e8cf 100644
--- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
@@ -50,7 +50,7 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer)
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	wstring playerName = L"";
-	if(pMinecraft->localplayers[ui.GetWinUserIndex()] != NULL)
+	if(pMinecraft->localplayers[ui.GetWinUserIndex()] != nullptr)
 	{
 		playerName = escapeXML( pMinecraft->localplayers[ui.GetWinUserIndex()]->getDisplayName() );
 	}
@@ -159,14 +159,14 @@ void UIScene_EndPoem::handleInput(int iPad, int key, bool repeat, bool pressed,
 			Minecraft *pMinecraft = Minecraft::GetInstance();
 			for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 			{
-				if(pMinecraft->localplayers[i] != NULL)
+				if(pMinecraft->localplayers[i] != nullptr)
 				{
 					app.SetAction(i,eAppAction_Respawn);
 				}
 			}
 
 			// This just allows it to be shown
-			if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
+			if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
 
 			updateTooltips();
 			navigateBack();
@@ -191,7 +191,7 @@ void UIScene_EndPoem::handleDestroy()
 
 void UIScene_EndPoem::handleRequestMoreData(F64 startIndex, bool up)
 {
-	m_requestedLabel = (int)startIndex;
+	m_requestedLabel = static_cast<int>(startIndex);
 }
 
 void UIScene_EndPoem::updateNoise()
@@ -221,13 +221,13 @@ void UIScene_EndPoem::updateNoise()
 		{
 			if (ui.UsingBitmapFont())
 			{
-				randomChar = SharedConstants::acceptableLetters[random->nextInt((int)SharedConstants::acceptableLetters.length())];
+				randomChar = SharedConstants::acceptableLetters[random->nextInt(static_cast<int>(SharedConstants::acceptableLetters.length()))];
 			}
 			else
 			{
 				// 4J-JEV: It'd be nice to avoid null characters when using asian languages.
 				static wstring acceptableLetters = L"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~";
-				randomChar = acceptableLetters[ random->nextInt((int)acceptableLetters.length()) ];
+				randomChar = acceptableLetters[ random->nextInt(static_cast<int>(acceptableLetters.length())) ];
 			}
 
 			wstring randomCharStr = L"";
diff --git a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
index 1d24f989..b33e086a 100644
--- a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
@@ -11,14 +11,14 @@ UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	FireworksScreenInput *initData = (FireworksScreenInput *)_initData;
+	FireworksScreenInput *initData = static_cast<FireworksScreenInput *>(_initData);
 
 	m_labelFireworks.init(app.GetString(IDS_HOW_TO_PLAY_MENU_FIREWORKS));
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Fireworks_Menu, this);
 	}
@@ -174,7 +174,7 @@ void UIScene_FireworksMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionFireworksIngredients:
@@ -198,7 +198,7 @@ void UIScene_FireworksMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_FireworksMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionFireworksIngredients:
diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
index fb17bda4..6a4ea096 100644
--- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
@@ -4,7 +4,6 @@
 #include "..\..\Minecraft.h"
 #include "..\..\ProgressRenderer.h"
 
-
 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	// Setup all the Iggy references we need for this scene
@@ -27,7 +26,7 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData,
 	m_buttonConfirm.init( app.GetString( IDS_CONFIRM_OK ), eControl_Confirm );
 	m_buttonConfirm.setVisible(false);
 
-	LoadingInputParams *params = (LoadingInputParams *)initData;
+	LoadingInputParams *params = static_cast<LoadingInputParams *>(initData);
 
 	m_CompletionData = params->completionData;
 	m_iPad=params->completionData->iPad;
@@ -102,7 +101,7 @@ void UIScene_FullscreenProgress::handleDestroy()
 	DWORD exitcode = *((DWORD *)&code);
 
 	// If we're active, have a cancel func, and haven't already cancelled, call cancel func
-	if( exitcode == STILL_ACTIVE && m_cancelFunc != NULL && !m_bWasCancelled)
+	if( exitcode == STILL_ACTIVE && m_cancelFunc != nullptr && !m_bWasCancelled)
 	{
 		m_bWasCancelled = true;
 		m_cancelFunc(m_cancelFuncParam);
@@ -224,7 +223,7 @@ void UIScene_FullscreenProgress::tick()
 
 						// This just allows it to be shown
 						Minecraft *pMinecraft = Minecraft::GetInstance();
-						if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
+						if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
 						ui.UpdatePlayerBasePositions();
 						navigateBack();
 					}
@@ -279,26 +278,27 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
 #ifdef __ORBIS__
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
-			if(pressed)
+			if(pressed && m_threadCompleted)
 			{
 				sendInputToMovie(key, repeat, pressed, released);
 			}
 			break;
 		case ACTION_MENU_B:
 		case ACTION_MENU_CANCEL:
-			if( pressed && m_cancelFunc != NULL && !m_bWasCancelled ) 			
+			if( pressed && m_cancelFunc != nullptr && !m_bWasCancelled ) 			
 			{
 				m_bWasCancelled = true;
 				m_cancelFunc( m_cancelFuncParam );
 			}
 			break;
 		}
+		handled = true;
 	}
 }
 
 void UIScene_FullscreenProgress::handlePress(F64 controlId, F64 childId)
 {
-	if(m_threadCompleted && (int)controlId == eControl_Confirm)
+	if(m_threadCompleted && static_cast<int>(controlId) == eControl_Confirm)
 	{
 		// This assumes all buttons can only be pressed with the A button
 		ui.AnimateKeyPress(m_iPad, ACTION_MENU_A, false, true, false);
diff --git a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
index 392221a6..9dcbe45b 100644
--- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
@@ -10,7 +10,7 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *par
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	FurnaceScreenInput *initData = (FurnaceScreenInput *)_initData;
+	FurnaceScreenInput *initData = static_cast<FurnaceScreenInput *>(_initData);
 	m_furnace = initData->furnace;
 
 	m_labelFurnace.init(m_furnace->getName());
@@ -21,9 +21,9 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *par
 	m_progressFurnaceArrow.init(L"",0,0,24,0);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Furnace_Menu, this);
 	}
@@ -202,7 +202,7 @@ void UIScene_FurnaceMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionFurnaceResult:
@@ -230,7 +230,7 @@ void UIScene_FurnaceMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 UIControl *UIScene_FurnaceMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionFurnaceResult:
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
index c3d52cf9..213caa8d 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
@@ -1,871 +1,886 @@
-#include "stdafx.h"
-#include "UI.h"
-#include "UIScene_HUD.h"
-#include "BossMobGuiInfo.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-
-UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
-{
-	m_bSplitscreen = false;
-
-	// Setup all the Iggy references we need for this scene
-	initialiseMovie();
-
-	SetDragonLabel( app.GetString( IDS_BOSS_ENDERDRAGON_HEALTH ) );
-	SetSelectedLabel(L"");
-
-	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)
-	{
-		m_labelChatText[i].init(L"");
-	}
-	m_labelJukebox.init(L"");
-
-	addTimer(0, 100);
-}
-
-wstring UIScene_HUD::getMoviePath()
-{
-	switch( m_parentLayer->getViewport() )
-	{
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		m_bSplitscreen = true;
-		return L"HUDSplit";
-		break;
-	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
-	default:
-		m_bSplitscreen = false;
-		return L"HUD";
-		break;
-	}
-}
-
-void UIScene_HUD::updateSafeZone()
-{
-	// Distance from edge
-	F64 safeTop = 0.0;
-	F64 safeBottom = 0.0;
-	F64 safeLeft = 0.0;
-	F64 safeRight = 0.0;
-
-	switch( m_parentLayer->getViewport() )
-	{
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-		safeTop = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		safeBottom = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-		safeLeft = getSafeZoneHalfWidth();
-		safeTop = getSafeZoneHalfHeight();
-		safeBottom = getSafeZoneHalfHeight();
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		safeRight = getSafeZoneHalfWidth();
-		safeTop = getSafeZoneHalfHeight();
-		safeBottom = getSafeZoneHalfHeight();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-		safeTop = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-		safeTop = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
-	default:
-		safeTop = getSafeZoneHalfHeight();
-		safeBottom = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	}
-	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);
-}
-
-void UIScene_HUD::tick()
-{
-	UIScene::tick();
-	if(getMovie() && app.GetGameStarted())
-	{
-		Minecraft *pMinecraft = Minecraft::GetInstance();
-		if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL)
-		{
-			return;
-		}
-
-		// Is boss present?
-		bool noBoss = BossMobGuiInfo::name.empty() || BossMobGuiInfo::displayTicks <= 0;
-		if (noBoss) 
-		{
-			if (m_showDragonHealth)
-			{
-				// No boss and health is visible
-				if(m_ticksWithNoBoss <= 20)
-				{
-					++m_ticksWithNoBoss;
-				}
-				else
-				{
-					ShowDragonHealth(false);
-				}
-			}
-		}
-		else
-		{
-			BossMobGuiInfo::displayTicks--;
-
-			m_ticksWithNoBoss = 0;			
-			SetDragonHealth(BossMobGuiInfo::healthProgress);
-
-			if (!m_showDragonHealth)
-			{
-				SetDragonLabel(BossMobGuiInfo::name);
-				ShowDragonHealth(true);
-			}
-		}
-	}
-}
-
-void UIScene_HUD::customDraw(IggyCustomDrawCallbackRegion *region)
-{
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
-
-	int slot = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slot);
-	if (slot == -1)
-	{
-		app.DebugPrintf("This is not the control we are looking for\n");
-	}
-	else
-	{
-		Slot *invSlot = pMinecraft->localplayers[m_iPad]->inventoryMenu->getSlot(InventoryMenu::USE_ROW_SLOT_START + slot);
-		shared_ptr<ItemInstance> item = invSlot->getItem();
-		if(item != NULL)
-		{
-			unsigned char ucAlpha=app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_InterfaceOpacity);
-			float fVal;
-
-			if(ucAlpha<80)
-			{
-				// check if we have the timer running for the opacity
-				unsigned int uiOpacityTimer=app.GetOpacityTimer(m_iPad);
-				if(uiOpacityTimer!=0)
-				{
-					if(uiOpacityTimer<10)
-					{
-						float fStep=(80.0f-(float)ucAlpha)/10.0f;
-						fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
-					}
-					else
-					{
-						fVal=0.01f*80.0f;
-					}
-				}
-				else
-				{
-					fVal=0.01f*(float)ucAlpha;
-				}
-			}
-			else
-			{
-				fVal=0.01f*(float)ucAlpha;
-			}
-			customDrawSlotControl(region,m_iPad,item,fVal,item->isFoil(),true);
-		}
-	}
-}
-
-void UIScene_HUD::handleReload()
-{
-	m_lastActiveSlot = -1;
-	m_iGuiScale = -1;
-	m_bToolTipsVisible = true;
-	m_lastExpProgress = 0.0f;
-	m_lastExpLevel = 0;
-	m_iCurrentHealth = 0;
-	m_lastMaxHealth = 20;
-	m_lastHealthBlink = false;
-	m_lastHealthPoison = false;
-	m_iCurrentFood = -1;
-	m_lastFoodPoison = false;
-	m_lastAir = 10;
-	m_currentExtraAir = 0;
-	m_lastArmour = 0;
-	m_showHealth = true;
-	m_showHorseHealth = true;
-	m_showFood = true;
-	m_showAir = false;	// get's initialised invisible anyways, by setting it to false we ensure it will remain visible when switching in and out of split screen!
-	m_showArmour = true;
-	m_showExpBar = true;
-	m_bRegenEffectEnabled = false;
-	m_iFoodSaturation = 0;
-	m_lastDragonHealth = 0.0f;
-	m_showDragonHealth = false;
-	m_ticksWithNoBoss = 0;
-	m_uiSelectedItemOpacityCountDown = 0;
-	m_displayName = L"";
-	m_lastShowDisplayName = true;
-	m_bRidingHorse = true;
-	m_horseHealth = 1;
-	m_lastHealthWither = true;
-	m_iCurrentHealthAbsorb = -1;
-	m_horseJumpProgress = 1.0f;
-	m_iHeartOffsetIndex = -1;
-	m_bHealthAbsorbActive = false;
-	m_iHorseMaxHealth = -1;
-
-	m_labelDisplayName.setVisible(m_lastShowDisplayName);
-
-	SetDragonLabel(BossMobGuiInfo::name);
-	SetSelectedLabel(L"");
-
-	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)
-	{
-		m_labelChatText[i].init(L"");
-	}
-	m_labelJukebox.init(L"");
-
-	int iGuiScale;	
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localplayers[m_iPad]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
-	{
-		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISize);
-	}
-	else
-	{
-		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen);
-	}
-	SetHudSize(iGuiScale);
-
-	SetDisplayName(ProfileManager.GetDisplayName(m_iPad));
-
-	repositionHud();
-
-	SetTooltipsEnabled(((ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad())) || (app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_Tooltips) != 0)));
-}
-
-int UIScene_HUD::getPad()
-{
-	return m_iPad;
-}
-
-void UIScene_HUD::SetOpacity(float opacity)
-{
-	setOpacity(opacity);
-}
-
-void UIScene_HUD::SetVisible(bool visible)
-{
-	setVisible(visible);
-}
-
-void UIScene_HUD::SetHudSize(int scale)
-{
-	if(scale != m_iGuiScale)
-	{
-		m_iGuiScale = scale;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = scale;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcLoadHud , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetExpBarProgress(float progress, int xpNeededForNextLevel)
-{
-	if(progress != m_lastExpProgress)
-	{
-		m_lastExpProgress = progress;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = progress;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetExpBarProgress , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetExpLevel(int level)
-{
-	if(level != m_lastExpLevel)
-	{
-		m_lastExpLevel = level;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = level;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlayerLevel , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetActiveSlot(int slot)
-{
-	if(slot != m_lastActiveSlot)
-	{
-		m_lastActiveSlot = slot;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = slot;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetActiveSlot , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetHealth(int iHealth, int iLastHealth, bool bBlink, bool bPoison, bool bWither)
-{
-	int maxHealth = max(iHealth, iLastHealth);
-	if(maxHealth != m_lastMaxHealth || bBlink != m_lastHealthBlink || bPoison != m_lastHealthPoison || bWither != m_lastHealthWither)
-	{
-		m_lastMaxHealth = maxHealth;
-		m_lastHealthBlink = bBlink;
-		m_lastHealthPoison = bPoison;
-		m_lastHealthWither = bWither;
-
-		IggyDataValue result;
-		IggyDataValue value[4];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = maxHealth;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = bBlink;
-		value[2].type = IGGY_DATATYPE_boolean;
-		value[2].boolval = bPoison;
-		value[3].type = IGGY_DATATYPE_boolean;
-		value[3].boolval = bWither;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealth , 4 , value );
-	}
-}
-
-void UIScene_HUD::SetFood(int iFood, int iLastFood, bool bPoison)
-{
-	// Ignore iLastFood as food doesn't flash
-	int maxFood = iFood; //, iLastFood);
-	if(maxFood != m_iCurrentFood || bPoison != m_lastFoodPoison)
-	{
-		m_iCurrentFood = maxFood;
-		m_lastFoodPoison = bPoison;
-
-		IggyDataValue result;
-		IggyDataValue value[2];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = maxFood;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = bPoison;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFood , 2 , value );
-	}
-}
-
-void UIScene_HUD::SetAir(int iAir, int extra)
-{
-	if(iAir != m_lastAir)
-	{
-		app.DebugPrintf("SetAir to %d\n", iAir);
-		m_lastAir = iAir;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = iAir;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetAir , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetArmour(int iArmour)
-{
-	if(iArmour != m_lastArmour)
-	{
-		app.DebugPrintf("SetArmour to %d\n", iArmour);
-		m_lastArmour = iArmour;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = iArmour;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetArmour , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowHealth(bool show)
-{
-	if(show != m_showHealth)
-	{
-		app.DebugPrintf("ShowHealth to %s\n", show?"TRUE":"FALSE");
-		m_showHealth = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowHorseHealth(bool show)
-{
-	if(show != m_showHorseHealth)
-	{
-		app.DebugPrintf("ShowHorseHealth to %s\n", show?"TRUE":"FALSE");
-		m_showHorseHealth = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHorseHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowFood(bool show)
-{
-	if(show != m_showFood)
-	{
-		app.DebugPrintf("ShowFood to %s\n", show?"TRUE":"FALSE");
-		m_showFood = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowFood , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowAir(bool show)
-{
-	if(show != m_showAir)
-	{
-		app.DebugPrintf("ShowAir to %s\n", show?"TRUE":"FALSE");
-		m_showAir = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowAir , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowArmour(bool show)
-{
-	if(show != m_showArmour)
-	{
-		app.DebugPrintf("ShowArmour to %s\n", show?"TRUE":"FALSE");
-		m_showArmour = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowArmour , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowExpBar(bool show)
-{
-	if(show != m_showExpBar)
-	{
-		app.DebugPrintf("ShowExpBar to %s\n", show?"TRUE":"FALSE");
-		m_showExpBar = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowExpbar , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetRegenerationEffect(bool bEnabled)
-{
-	if(bEnabled != m_bRegenEffectEnabled)
-	{
-		app.DebugPrintf("SetRegenerationEffect to %s\n", bEnabled?"TRUE":"FALSE");
-		m_bRegenEffectEnabled = bEnabled;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = bEnabled;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRegenerationEffect , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetFoodSaturationLevel(int iSaturation)
-{
-	if(iSaturation != m_iFoodSaturation)
-	{
-		app.DebugPrintf("Set saturation to %d\n", iSaturation);
-		m_iFoodSaturation = iSaturation;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = iSaturation;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFoodSaturationLevel , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetDragonHealth(float health)
-{
-	if(health != m_lastDragonHealth)
-	{
-		app.DebugPrintf("Set dragon health to %f\n", health);
-		m_lastDragonHealth = health;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = health;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetDragonLabel(const wstring &label)
-{
-	IggyDataValue result;
-	IggyDataValue value[1];
-	IggyStringUTF16 stringVal;
-	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = label.length();
-	value[0].type = IGGY_DATATYPE_string_UTF16;
-	value[0].string16 = stringVal;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonLabel , 1 , value );
-}
-
-void UIScene_HUD::ShowDragonHealth(bool show)
-{
-	if(show != m_showDragonHealth)
-	{
-		app.DebugPrintf("ShowDragonHealth to %s\n", show?"TRUE":"FALSE");
-		m_showDragonHealth = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowDragonHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetSelectedLabel(const wstring &label)
-{
-	// 4J Stu - Timing here is kept the same as on Xbox360, even though we do it differently now and do the fade out in Flash rather than directly setting opacity
-	if(!label.empty()) m_uiSelectedItemOpacityCountDown = SharedConstants::TICKS_PER_SECOND * 3;
-
-	IggyDataValue result;
-	IggyDataValue value[1];
-	IggyStringUTF16 stringVal;
-	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = label.length();
-	value[0].type = IGGY_DATATYPE_string_UTF16;
-	value[0].string16 = stringVal;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetSelectedLabel , 1 , value );
-}
-
-void UIScene_HUD::HideSelectedLabel()
-{
-	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHideSelectedLabel , 0 , NULL );
-}
-
-
-void UIScene_HUD::SetRidingHorse(bool ridingHorse, bool bIsJumpable, int maxHorseHealth)
-{
-	if(m_bRidingHorse != ridingHorse || maxHorseHealth != m_iHorseMaxHealth)
-	{
-		app.DebugPrintf("SetRidingHorse to %s\n", ridingHorse?"TRUE":"FALSE");
-		m_bRidingHorse = ridingHorse;
-		m_bIsJumpable = bIsJumpable;
-		m_iHorseMaxHealth = maxHorseHealth;
-
-		IggyDataValue result;
-		IggyDataValue value[3];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = ridingHorse;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = bIsJumpable;
-		value[2].type = IGGY_DATATYPE_number;
-		value[2].number = maxHorseHealth;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRidingHorse , 3 , value );
-	}
-}
-
-void UIScene_HUD::SetHorseHealth(int health, bool blink /*= false*/)
-{
-	if(m_bRidingHorse && m_horseHealth != health)
-	{
-		app.DebugPrintf("SetHorseHealth to %d\n", health);
-		m_horseHealth = health;
-
-		IggyDataValue result;
-		IggyDataValue value[2];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = health;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = blink;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseHealth , 2 , value );
-	}
-}
-
-void UIScene_HUD::SetHorseJumpBarProgress(float progress)
-{
-	if(m_bRidingHorse && m_horseJumpProgress != progress)
-	{
-		app.DebugPrintf("SetHorseJumpBarProgress to %f\n", progress);
-		m_horseJumpProgress = progress;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = progress;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseJumpBarProgress , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetHealthAbsorb(int healthAbsorb)
-{
-	if(m_iCurrentHealthAbsorb != healthAbsorb)
-	{
-		app.DebugPrintf("SetHealthAbsorb to %d\n", healthAbsorb);
-		m_iCurrentHealthAbsorb = healthAbsorb;
-
-		IggyDataValue result;
-		IggyDataValue value[2];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = healthAbsorb > 0;
-		value[1].type = IGGY_DATATYPE_number;
-		value[1].number = healthAbsorb;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealthAbsorb , 2 , value );
-	}
-}
-
-void UIScene_HUD::render(S32 width, S32 height, C4JRender::eViewportType viewport)
-{
-	if(m_bSplitscreen)
-	{
-		S32 xPos = 0;
-		S32 yPos = 0;
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		}
-		ui.setupRenderPosition(xPos, yPos);
-
-		S32 tileXStart = 0;
-		S32 tileYStart = 0;
-		S32 tileWidth = width;
-		S32 tileHeight = height;
-
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
-		}
-
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
-		
-		m_renderWidth = tileWidth;
-		m_renderHeight = tileHeight;
-
-		IggyPlayerDrawTilesStart ( getMovie() );
-		IggyPlayerDrawTile ( getMovie() ,
-			tileXStart ,
-			tileYStart ,
-			tileXStart + tileWidth ,
-			tileYStart + tileHeight ,
-			0 ); 
-		IggyPlayerDrawTilesEnd ( getMovie() );
-	}
-	else
-	{
-		UIScene::render(width, height, viewport);
-	}
-}
-
-void UIScene_HUD::handleTimerComplete(int id)
-{
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	
-	bool anyVisible = false;
-	if(pMinecraft->localplayers[m_iPad]!= NULL)
-	{
-		Gui *pGui = pMinecraft->gui;
-		//DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) );
-		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )
-		{
-			float opacity = pGui->getOpacity(m_iPad, i);
-			if( opacity > 0 )
-			{
-				m_controlLabelBackground[i].setOpacity(opacity);
-				m_labelChatText[i].setOpacity(opacity);
-				m_labelChatText[i].setLabel( pGui->getMessagesCount(m_iPad) ? pGui->getMessage(m_iPad,i) : L"" );
-
-				anyVisible = true;
-			}
-			else
-			{
-				m_controlLabelBackground[i].setOpacity(0);
-				m_labelChatText[i].setOpacity(0);
-				m_labelChatText[i].setLabel(L"");
-			}
-		}
-		if(pGui->getJukeboxOpacity(m_iPad) > 0) anyVisible = true;
-		m_labelJukebox.setOpacity( pGui->getJukeboxOpacity(m_iPad) );
-		m_labelJukebox.setLabel( pGui->getJukeboxMessage(m_iPad) );
-	}
-	else
-	{
-		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )
-		{
-			m_controlLabelBackground[i].setOpacity(0);
-			m_labelChatText[i].setOpacity(0);
-			m_labelChatText[i].setLabel(L"");
-		}
-		m_labelJukebox.setOpacity( 0 );
-	}
-
-	//setVisible(anyVisible);
-}
-
-void UIScene_HUD::repositionHud()
-{
-	if(!m_bSplitscreen) return;
-
-	S32 width = 0;
-	S32 height = 0;
-	m_parentLayer->getRenderDimensions( width, height );
-
-	switch( m_parentLayer->getViewport() )
-	{
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		height = (S32)(ui.getScreenHeight());
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		width = (S32)(ui.getScreenWidth());
-		break;
-	}
-
-	app.DebugPrintf(app.USER_SR, "Reposition HUD with dims %d, %d\n", width, height );
-
-	IggyDataValue result;
-	IggyDataValue value[2];
-	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = width;
-	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = height;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcRepositionHud , 2 , value );
-}
-
-void UIScene_HUD::ShowDisplayName(bool show)
-{
-	m_lastShowDisplayName = show;
-	m_labelDisplayName.setVisible(show);
-}
-
-void UIScene_HUD::SetDisplayName(const wstring &displayName)
-{
-	if(displayName.compare(m_displayName) != 0)
-	{
-		m_displayName = displayName;
-		
-		IggyDataValue result;
-		IggyDataValue value[1];
-		IggyStringUTF16 stringVal;
-		stringVal.string = (IggyUTF16*)displayName.c_str();
-		stringVal.length = displayName.length();
-		value[0].type = IGGY_DATATYPE_string_UTF16;
-		value[0].string16 = stringVal;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDisplayName , 1 , value );
-
-		m_labelDisplayName.setVisible(m_lastShowDisplayName);
-	}
-}
-
-void UIScene_HUD::SetTooltipsEnabled(bool bEnabled)
-{
-	if(m_bToolTipsVisible != bEnabled)
-	{
-		m_bToolTipsVisible = bEnabled;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = bEnabled;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetTooltipsEnabled , 1 , value );
-	}
-}
-
-void UIScene_HUD::handleGameTick()
-{
-	if(getMovie() && app.GetGameStarted())
-	{
-		Minecraft *pMinecraft = Minecraft::GetInstance();
-		if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL)
-		{
-			m_parentLayer->showComponent(m_iPad, eUIScene_HUD,false);
-			return;
-		}
-		m_parentLayer->showComponent(m_iPad, eUIScene_HUD,true);
-
-		updateFrameTick();
-	}
+#include "stdafx.h"

+#include "UI.h"

+#include "UIScene_HUD.h"

+#include "UISplitScreenHelpers.h"

+#include "BossMobGuiInfo.h"

+#include "..\..\Minecraft.h"

+#include "..\..\MultiplayerLocalPlayer.h"

+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"

+#include "..\..\EnderDragonRenderer.h"

+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"

+#include "..\..\..\Minecraft.World\StringHelpers.h"

+

+UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)

+{

+	m_bSplitscreen = false;

+

+	// Setup all the Iggy references we need for this scene

+	initialiseMovie();

+

+	SetDragonLabel( app.GetString( IDS_BOSS_ENDERDRAGON_HEALTH ) );

+	SetSelectedLabel(L"");

+

+	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)

+	{

+		m_labelChatText[i].init(L"");

+	}

+	m_labelJukebox.init(L"");

+

+	addTimer(0, 100);

+}

+

+wstring UIScene_HUD::getMoviePath()

+{

+	switch( m_parentLayer->getViewport() )

+	{

+	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:

+	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:

+	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+		m_bSplitscreen = true;

+		return L"HUDSplit";

+		break;

+	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:

+	default:

+		m_bSplitscreen = false;

+		return L"HUD";

+		break;

+	}

+}

+

+void UIScene_HUD::updateSafeZone()

+{

+	// Distance from edge

+	F64 safeTop = 0.0;

+	F64 safeBottom = 0.0;

+	F64 safeLeft = 0.0;

+	F64 safeRight = 0.0;

+

+	switch( m_parentLayer->getViewport() )

+	{

+	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+		// safeTop mirrors SPLIT_TOP so both players have the same vertical inset

+		// from their viewport's top edge (split divider), keeping GUI symmetrical.

+		// safeBottom is intentionally omitted: it would shift m_Hud.y upward in

+		// ActionScript, placing the hotbar too high relative to SPLIT_TOP.

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:

+		safeTop = getSafeZoneHalfHeight();

+		safeBottom = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+		break;

+	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+		safeTop = getSafeZoneHalfHeight();

+		safeBottom = getSafeZoneHalfHeight();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+		safeTop = getSafeZoneHalfHeight();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+		safeTop = getSafeZoneHalfHeight();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:

+	default:

+		safeTop = getSafeZoneHalfHeight();

+		safeBottom = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+

+		break;

+	}

+	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);

+}

+

+void UIScene_HUD::tick()

+{

+	UIScene::tick();

+	if(getMovie() && app.GetGameStarted())

+	{

+		Minecraft *pMinecraft = Minecraft::GetInstance();

+		if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr)

+		{

+			return;

+		}

+

+		// Is boss present?

+		bool noBoss = BossMobGuiInfo::name.empty() || BossMobGuiInfo::displayTicks <= 0;

+		if (noBoss) 

+		{

+			if (m_showDragonHealth)

+			{

+				// No boss and health is visible

+				if(m_ticksWithNoBoss <= 20)

+				{

+					++m_ticksWithNoBoss;

+				}

+				else

+				{

+					ShowDragonHealth(false);

+				}

+			}

+		}

+		else

+		{

+			BossMobGuiInfo::displayTicks--;

+

+			m_ticksWithNoBoss = 0;			

+			SetDragonHealth(BossMobGuiInfo::healthProgress);

+

+			if (!m_showDragonHealth)

+			{

+				SetDragonLabel(BossMobGuiInfo::name);

+				ShowDragonHealth(true);

+			}

+		}

+	}

+}

+

+void UIScene_HUD::customDraw(IggyCustomDrawCallbackRegion *region)

+{

+	Minecraft *pMinecraft = Minecraft::GetInstance();

+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;

+

+	int slot = -1;

+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slot);

+	if (slot == -1)

+	{

+		app.DebugPrintf("This is not the control we are looking for\n");

+	}

+	else

+	{

+		Slot *invSlot = pMinecraft->localplayers[m_iPad]->inventoryMenu->getSlot(InventoryMenu::USE_ROW_SLOT_START + slot);

+		shared_ptr<ItemInstance> item = invSlot->getItem();

+		if(item != nullptr)

+		{

+			unsigned char ucAlpha=app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_InterfaceOpacity);

+			float fVal;

+

+			if(ucAlpha<80)

+			{

+				// check if we have the timer running for the opacity

+				unsigned int uiOpacityTimer=app.GetOpacityTimer(m_iPad);

+				if(uiOpacityTimer!=0)

+				{

+					if(uiOpacityTimer<10)

+					{

+						float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;

+						fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));

+					}

+					else

+					{

+						fVal=0.01f*80.0f;

+					}

+				}

+				else

+				{

+					fVal=0.01f*static_cast<float>(ucAlpha);

+				}

+			}

+			else

+			{

+				fVal=0.01f*static_cast<float>(ucAlpha);

+			}

+			customDrawSlotControl(region,m_iPad,item,fVal,item->isFoil(),true);

+		}

+	}

+}

+

+void UIScene_HUD::handleReload()

+{

+	m_lastActiveSlot = -1;

+	m_iGuiScale = -1;

+	m_bToolTipsVisible = true;

+	m_lastExpProgress = 0.0f;

+	m_lastExpLevel = 0;

+	m_iCurrentHealth = 0;

+	m_lastMaxHealth = 20;

+	m_lastHealthBlink = false;

+	m_lastHealthPoison = false;

+	m_iCurrentFood = -1;

+	m_lastFoodPoison = false;

+	m_lastAir = 10;

+	m_currentExtraAir = 0;

+	m_lastArmour = 0;

+	m_showHealth = true;

+	m_showHorseHealth = true;

+	m_showFood = true;

+	m_showAir = false;	// get's initialised invisible anyways, by setting it to false we ensure it will remain visible when switching in and out of split screen!

+	m_showArmour = true;

+	m_showExpBar = true;

+	m_bRegenEffectEnabled = false;

+	m_iFoodSaturation = 0;

+	m_lastDragonHealth = 0.0f;

+	m_showDragonHealth = false;

+	m_ticksWithNoBoss = 0;

+	m_uiSelectedItemOpacityCountDown = 0;

+	m_displayName = L"";

+	m_lastShowDisplayName = true;

+	m_bRidingHorse = true;

+	m_horseHealth = 1;

+	m_lastHealthWither = true;

+	m_iCurrentHealthAbsorb = -1;

+	m_horseJumpProgress = 1.0f;

+	m_iHeartOffsetIndex = -1;

+	m_bHealthAbsorbActive = false;

+	m_iHorseMaxHealth = -1;

+

+	m_labelDisplayName.setVisible(m_lastShowDisplayName);

+

+	SetDragonLabel(BossMobGuiInfo::name);

+	SetSelectedLabel(L"");

+

+	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)

+	{

+		m_labelChatText[i].init(L"");

+	}

+	m_labelJukebox.init(L"");

+

+	int iGuiScale;	

+	Minecraft *pMinecraft = Minecraft::GetInstance();

+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localplayers[m_iPad]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)

+	{

+		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISize);

+	}

+	else

+	{

+		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen);

+	}

+	SetHudSize(iGuiScale);

+

+	SetDisplayName(ProfileManager.GetDisplayName(m_iPad));

+

+	SetTooltipsEnabled(((ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad())) || (app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_Tooltips) != 0)));

+}

+

+int UIScene_HUD::getPad()

+{

+	return m_iPad;

+}

+

+void UIScene_HUD::SetOpacity(float opacity)

+{

+	setOpacity(opacity);

+}

+

+void UIScene_HUD::SetVisible(bool visible)

+{

+	setVisible(visible);

+}

+

+void UIScene_HUD::SetHudSize(int scale)

+{

+	if(scale != m_iGuiScale)

+	{

+		m_iGuiScale = scale;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = scale;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcLoadHud , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetExpBarProgress(float progress, int xpNeededForNextLevel)

+{

+	if(progress != m_lastExpProgress)

+	{

+		m_lastExpProgress = progress;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = progress;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetExpBarProgress , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetExpLevel(int level)

+{

+	if(level != m_lastExpLevel)

+	{

+		m_lastExpLevel = level;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = level;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlayerLevel , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetActiveSlot(int slot)

+{

+	if(slot != m_lastActiveSlot)

+	{

+		m_lastActiveSlot = slot;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = slot;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetActiveSlot , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetHealth(int iHealth, int iLastHealth, bool bBlink, bool bPoison, bool bWither)

+{

+	int maxHealth = max(iHealth, iLastHealth);

+	if(maxHealth != m_lastMaxHealth || bBlink != m_lastHealthBlink || bPoison != m_lastHealthPoison || bWither != m_lastHealthWither)

+	{

+		m_lastMaxHealth = maxHealth;

+		m_lastHealthBlink = bBlink;

+		m_lastHealthPoison = bPoison;

+		m_lastHealthWither = bWither;

+

+		IggyDataValue result;

+		IggyDataValue value[4];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = maxHealth;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = bBlink;

+		value[2].type = IGGY_DATATYPE_boolean;

+		value[2].boolval = bPoison;

+		value[3].type = IGGY_DATATYPE_boolean;

+		value[3].boolval = bWither;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealth , 4 , value );

+	}

+}

+

+void UIScene_HUD::SetFood(int iFood, int iLastFood, bool bPoison)

+{

+	// Ignore iLastFood as food doesn't flash

+	int maxFood = iFood; //, iLastFood);

+	if(maxFood != m_iCurrentFood || bPoison != m_lastFoodPoison)

+	{

+		m_iCurrentFood = maxFood;

+		m_lastFoodPoison = bPoison;

+

+		IggyDataValue result;

+		IggyDataValue value[2];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = maxFood;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = bPoison;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFood , 2 , value );

+	}

+}

+

+void UIScene_HUD::SetAir(int iAir, int extra)

+{

+	if(iAir != m_lastAir)

+	{

+		app.DebugPrintf("SetAir to %d\n", iAir);

+		m_lastAir = iAir;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = iAir;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetAir , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetArmour(int iArmour)

+{

+	if(iArmour != m_lastArmour)

+	{

+		app.DebugPrintf("SetArmour to %d\n", iArmour);

+		m_lastArmour = iArmour;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = iArmour;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetArmour , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowHealth(bool show)

+{

+	if(show != m_showHealth)

+	{

+		app.DebugPrintf("ShowHealth to %s\n", show?"TRUE":"FALSE");

+		m_showHealth = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowHorseHealth(bool show)

+{

+	if(show != m_showHorseHealth)

+	{

+		app.DebugPrintf("ShowHorseHealth to %s\n", show?"TRUE":"FALSE");

+		m_showHorseHealth = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHorseHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowFood(bool show)

+{

+	if(show != m_showFood)

+	{

+		app.DebugPrintf("ShowFood to %s\n", show?"TRUE":"FALSE");

+		m_showFood = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowFood , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowAir(bool show)

+{

+	if(show != m_showAir)

+	{

+		app.DebugPrintf("ShowAir to %s\n", show?"TRUE":"FALSE");

+		m_showAir = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowAir , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowArmour(bool show)

+{

+	if(show != m_showArmour)

+	{

+		app.DebugPrintf("ShowArmour to %s\n", show?"TRUE":"FALSE");

+		m_showArmour = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowArmour , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowExpBar(bool show)

+{

+	if(show != m_showExpBar)

+	{

+		app.DebugPrintf("ShowExpBar to %s\n", show?"TRUE":"FALSE");

+		m_showExpBar = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowExpbar , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetRegenerationEffect(bool bEnabled)

+{

+	if(bEnabled != m_bRegenEffectEnabled)

+	{

+		app.DebugPrintf("SetRegenerationEffect to %s\n", bEnabled?"TRUE":"FALSE");

+		m_bRegenEffectEnabled = bEnabled;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = bEnabled;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRegenerationEffect , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetFoodSaturationLevel(int iSaturation)

+{

+	if(iSaturation != m_iFoodSaturation)

+	{

+		app.DebugPrintf("Set saturation to %d\n", iSaturation);

+		m_iFoodSaturation = iSaturation;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = iSaturation;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFoodSaturationLevel , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetDragonHealth(float health)

+{

+	if(health != m_lastDragonHealth)

+	{

+		app.DebugPrintf("Set dragon health to %f\n", health);

+		m_lastDragonHealth = health;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = health;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetDragonLabel(const wstring &label)

+{

+	IggyDataValue result;

+	IggyDataValue value[1];

+	IggyStringUTF16 stringVal;

+	stringVal.string = (IggyUTF16*)label.c_str();

+	stringVal.length = label.length();

+	value[0].type = IGGY_DATATYPE_string_UTF16;

+	value[0].string16 = stringVal;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonLabel , 1 , value );

+}

+

+void UIScene_HUD::ShowDragonHealth(bool show)

+{

+	if(show != m_showDragonHealth)

+	{

+		app.DebugPrintf("ShowDragonHealth to %s\n", show?"TRUE":"FALSE");

+		m_showDragonHealth = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowDragonHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetSelectedLabel(const wstring &label)

+{

+	// 4J Stu - Timing here is kept the same as on Xbox360, even though we do it differently now and do the fade out in Flash rather than directly setting opacity

+	if(!label.empty()) m_uiSelectedItemOpacityCountDown = SharedConstants::TICKS_PER_SECOND * 3;

+

+	IggyDataValue result;

+	IggyDataValue value[1];

+	IggyStringUTF16 stringVal;

+	stringVal.string = (IggyUTF16*)label.c_str();

+	stringVal.length = label.length();

+	value[0].type = IGGY_DATATYPE_string_UTF16;

+	value[0].string16 = stringVal;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetSelectedLabel , 1 , value );

+}

+

+void UIScene_HUD::HideSelectedLabel()

+{

+	IggyDataValue result;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHideSelectedLabel , 0 , nullptr );

+}

+

+

+void UIScene_HUD::SetRidingHorse(bool ridingHorse, bool bIsJumpable, int maxHorseHealth)

+{

+	if(m_bRidingHorse != ridingHorse || maxHorseHealth != m_iHorseMaxHealth)

+	{

+		app.DebugPrintf("SetRidingHorse to %s\n", ridingHorse?"TRUE":"FALSE");

+		m_bRidingHorse = ridingHorse;

+		m_bIsJumpable = bIsJumpable;

+		m_iHorseMaxHealth = maxHorseHealth;

+

+		IggyDataValue result;

+		IggyDataValue value[3];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = ridingHorse;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = bIsJumpable;

+		value[2].type = IGGY_DATATYPE_number;

+		value[2].number = maxHorseHealth;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRidingHorse , 3 , value );

+	}

+}

+

+void UIScene_HUD::SetHorseHealth(int health, bool blink /*= false*/)

+{

+	if(m_bRidingHorse && m_horseHealth != health)

+	{

+		app.DebugPrintf("SetHorseHealth to %d\n", health);

+		m_horseHealth = health;

+

+		IggyDataValue result;

+		IggyDataValue value[2];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = health;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = blink;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseHealth , 2 , value );

+	}

+}

+

+void UIScene_HUD::SetHorseJumpBarProgress(float progress)

+{

+	if(m_bRidingHorse && m_horseJumpProgress != progress)

+	{

+		app.DebugPrintf("SetHorseJumpBarProgress to %f\n", progress);

+		m_horseJumpProgress = progress;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = progress;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseJumpBarProgress , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetHealthAbsorb(int healthAbsorb)

+{

+	if(m_iCurrentHealthAbsorb != healthAbsorb)

+	{

+		app.DebugPrintf("SetHealthAbsorb to %d\n", healthAbsorb);

+		m_iCurrentHealthAbsorb = healthAbsorb;

+

+		IggyDataValue result;

+		IggyDataValue value[2];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = healthAbsorb > 0;

+		value[1].type = IGGY_DATATYPE_number;

+		value[1].number = healthAbsorb;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealthAbsorb , 2 , value );

+	}

+}

+

+void UIScene_HUD::render(S32 width, S32 height, C4JRender::eViewportType viewport)

+{

+	if(m_bSplitscreen)

+	{

+		S32 xPos = 0;

+		S32 yPos = 0;

+		switch( viewport )

+		{

+		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);

+			break;

+		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);

+			break;

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);

+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);

+			break;

+		}

+		ui.setupRenderPosition(xPos, yPos);

+

+		S32 tileXStart = 0;

+		S32 tileYStart = 0;

+		S32 tileWidth = width;

+		S32 tileHeight = height;

+

+		bool needsYTile = false;

+		switch( viewport )

+		{

+		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:

+		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+			tileHeight = static_cast<S32>(ui.getScreenHeight());

+			break;

+		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+			tileWidth = static_cast<S32>(ui.getScreenWidth());

+			needsYTile = true;

+			break;

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+			needsYTile = true;

+			break;

+		}

+

+		F32 scale;

+		ComputeTileScale(tileWidth, tileHeight, m_movieWidth, m_movieHeight, needsYTile, scale, tileYStart);

+

+		// For vertical split, if the window is shorter than the SWF movie,

+		// scale the movie down to fit the full height instead of cropping.

+		// ComputeTileScale clamps scale >= 1.0 (needed for quadrant mode),

+		// but in vertical split the tile covers the full screen height and

+		// cropping the bottom pushes RepositionHud's ActionScript to shift

+		// elements down.  Scaling down keeps visibleH == movieHeight in SWF

+		// space, so ActionScript sees the full height and applies no offset.

+		if(!needsYTile && m_movieHeight > 0)

+		{

+			F32 scaleH = (F32)tileHeight / (F32)m_movieHeight;

+			if(scaleH < scale)

+				scale = scaleH;

+		}

+

+		IggyPlayerSetDisplaySize( getMovie(), (S32)(m_movieWidth * scale), (S32)(m_movieHeight * scale) );

+

+		repositionHud(tileWidth, tileHeight, scale, needsYTile);

+

+		m_renderWidth = tileWidth;

+		m_renderHeight = tileHeight;

+

+		IggyPlayerDrawTilesStart ( getMovie() );

+		IggyPlayerDrawTile ( getMovie() ,

+			tileXStart ,

+			tileYStart ,

+			tileXStart + tileWidth ,

+			tileYStart + tileHeight ,

+			0 );

+		IggyPlayerDrawTilesEnd ( getMovie() );

+	}

+	else

+	{

+		UIScene::render(width, height, viewport);

+	}

+}

+

+void UIScene_HUD::handleTimerComplete(int id)

+{

+	Minecraft *pMinecraft = Minecraft::GetInstance();

+	

+	bool anyVisible = false;

+	if(pMinecraft->localplayers[m_iPad]!= nullptr)

+	{

+		Gui *pGui = pMinecraft->gui;

+		//DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) );

+		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )

+		{

+			float opacity = pGui->getOpacity(m_iPad, i);

+			if( opacity > 0 )

+			{

+#if 0 // def _WINDOWS64 // Use Iggy chat until Gui::render has visual parity

+				// Chat drawn by Gui::render with color codes. Hides Iggy chat to avoid double chats.

+				m_controlLabelBackground[i].setOpacity(0);

+				m_labelChatText[i].setOpacity(0);

+				m_labelChatText[i].setLabel(L"");

+#else

+				m_controlLabelBackground[i].setOpacity(opacity);

+				m_labelChatText[i].setOpacity(opacity);

+				m_labelChatText[i].setLabel( pGui->getMessagesCount(m_iPad) ? pGui->getMessage(m_iPad,i) : L"" );

+#endif

+				anyVisible = true;

+			}

+			else

+			{

+				m_controlLabelBackground[i].setOpacity(0);

+				m_labelChatText[i].setOpacity(0);

+				m_labelChatText[i].setLabel(L"");

+			}

+		}

+		if(pGui->getJukeboxOpacity(m_iPad) > 0) anyVisible = true;

+		m_labelJukebox.setOpacity( pGui->getJukeboxOpacity(m_iPad) );

+		m_labelJukebox.setLabel( pGui->getJukeboxMessage(m_iPad) );

+	}

+	else

+	{

+		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )

+		{

+			m_controlLabelBackground[i].setOpacity(0);

+			m_labelChatText[i].setOpacity(0);

+			m_labelChatText[i].setLabel(L"");

+		}

+		m_labelJukebox.setOpacity( 0 );

+	}

+

+	//setVisible(anyVisible);

+}

+

+void UIScene_HUD::repositionHud(S32 tileWidth, S32 tileHeight, F32 scale, bool needsYTile)

+{

+	if(!m_bSplitscreen) return;

+

+	// Pass the visible tile area in SWF coordinates so ActionScript

+	// positions elements (crosshair, hotbar, etc.) centered in the

+	// actually visible region, not the raw viewport.

+	S32 visibleW = static_cast<S32>(tileWidth / scale);

+	S32 visibleH = static_cast<S32>(tileHeight / scale);

+

+	app.DebugPrintf(app.USER_SR, "Reposition HUD: tile %dx%d, scale %.3f, visible SWF %dx%d\n", tileWidth, tileHeight, scale, visibleW, visibleH );

+

+	IggyDataValue result;

+	IggyDataValue value[2];

+	value[0].type = IGGY_DATATYPE_number;

+	value[0].number = visibleW;

+	value[1].type = IGGY_DATATYPE_number;

+	value[1].number = visibleH;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcRepositionHud , 2 , value );

+}

+

+void UIScene_HUD::ShowDisplayName(bool show)

+{

+	m_lastShowDisplayName = show;

+	m_labelDisplayName.setVisible(show);

+}

+

+void UIScene_HUD::SetDisplayName(const wstring &displayName)

+{

+	if(displayName.compare(m_displayName) != 0)

+	{

+		m_displayName = displayName;

+		

+		IggyDataValue result;

+		IggyDataValue value[1];

+		IggyStringUTF16 stringVal;

+		stringVal.string = (IggyUTF16*)displayName.c_str();

+		stringVal.length = displayName.length();

+		value[0].type = IGGY_DATATYPE_string_UTF16;

+		value[0].string16 = stringVal;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDisplayName , 1 , value );

+

+		m_labelDisplayName.setVisible(m_lastShowDisplayName);

+	}

+}

+

+void UIScene_HUD::SetTooltipsEnabled(bool bEnabled)

+{

+	if(m_bToolTipsVisible != bEnabled)

+	{

+		m_bToolTipsVisible = bEnabled;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = bEnabled;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetTooltipsEnabled , 1 , value );

+	}

+}

+

+void UIScene_HUD::handleGameTick()

+{

+	if(getMovie() && app.GetGameStarted())

+	{

+		Minecraft *pMinecraft = Minecraft::GetInstance();

+		if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr)

+		{

+			m_parentLayer->showComponent(m_iPad, eUIScene_HUD,false);

+			return;

+		}

+		m_parentLayer->showComponent(m_iPad, eUIScene_HUD,true);

+

+		updateFrameTick();

+	}

 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.h b/Minecraft.Client/Common/UI/UIScene_HUD.h
index 9d58ba4b..04468c8e 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.h
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.h
@@ -176,5 +176,5 @@ protected:
 #endif
 
 private:
-	void repositionHud();
+	void repositionHud(S32 tileWidth, S32 tileHeight, F32 scale, bool needsYTile);
 };
diff --git a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
index d442553f..ab79b940 100644
--- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
@@ -8,7 +8,7 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData,
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_buttons[BUTTON_HAO_CHANGESKIN].init(IDS_CHANGE_SKIN,BUTTON_HAO_CHANGESKIN);
 	m_buttons[BUTTON_HAO_HOWTOPLAY].init(IDS_HOW_TO_PLAY,BUTTON_HAO_HOWTOPLAY);
@@ -41,7 +41,7 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData,
 
 
 	// 4J-PB - do not need a storage device to see this menu - just need one when you choose to re-install them
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// any content to be re-installed? 
 	if(m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
@@ -103,7 +103,7 @@ void UIScene_HelpAndOptionsMenu::updateTooltips()
 
 void UIScene_HelpAndOptionsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -121,14 +121,14 @@ void UIScene_HelpAndOptionsMenu::updateComponents()
 
 void UIScene_HelpAndOptionsMenu::handleReload()
 {
-#ifdef _FINAL_BUILD
+#ifndef _DEBUG // def _FINAL_BUILD // disable debug settings in release builds
 	removeControl( &m_buttons[BUTTON_HAO_DEBUG], false);
 #else
 	if(!app.DebugSettingsOn()) removeControl( &m_buttons[BUTTON_HAO_DEBUG], false);
 #endif
 
 	// 4J-PB - do not need a storage device to see this menu - just need one when you choose to re-install them
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// any content to be re-installed? 
 	if(m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
@@ -207,7 +207,7 @@ void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, boo
 
 void UIScene_HelpAndOptionsMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case BUTTON_HAO_CHANGESKIN:
 		ui.NavigateToScene(m_iPad, eUIScene_SkinSelectMenu);
diff --git a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
index f0f6db18..8c657c97 100644
--- a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
@@ -10,14 +10,14 @@ UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void *_initData, UILayer *paren
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	HopperScreenInput *initData = (HopperScreenInput *)_initData;
+	HopperScreenInput *initData = static_cast<HopperScreenInput *>(_initData);
 
 	m_labelDispenser.init(initData->hopper->getName());
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Hopper_Menu, this);
 	}
@@ -156,7 +156,7 @@ void UIScene_HopperMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionHopperContents:
@@ -177,7 +177,7 @@ void UIScene_HopperMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 UIControl *UIScene_HopperMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionHopperContents:
diff --git a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
index ab98e30f..c062df4e 100644
--- a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
@@ -11,16 +11,16 @@ UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, void *_initData
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	HorseScreenInput *initData = (HorseScreenInput *)_initData;
+	HorseScreenInput *initData = static_cast<HorseScreenInput *>(_initData);
 
 	m_labelHorse.init( initData->container->getName() );
 	m_inventory = initData->inventory;
 	m_horse = initData->horse;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Horse_Menu, this);
 	}
@@ -240,7 +240,7 @@ void UIScene_HorseInventoryMenu::setSectionSelectedSlot(ESceneSection eSection,
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionHorseArmor:
@@ -268,7 +268,7 @@ void UIScene_HorseInventoryMenu::setSectionSelectedSlot(ESceneSection eSection,
 
 UIControl *UIScene_HorseInventoryMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionHorseArmor:
@@ -296,7 +296,7 @@ UIControl *UIScene_HorseInventoryMenu::getSection(ESceneSection eSection)
 void UIScene_HorseInventoryMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	if(wcscmp((wchar_t *)region->name,L"horse")==0)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
index e33e24fe..bc721802 100644
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
@@ -136,7 +136,7 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void *initData, UILayer *parentLa
 	// Extract pad and required page from init data. We just put the data into the pointer rather than using it as an address.
 	size_t uiInitData = ( size_t )( initData );
 	
-	EHowToPlayPage eStartPage = ( EHowToPlayPage )( ( uiInitData >> 16 ) & 0xFFF );		// Ignores MSB which is set to 1!
+	EHowToPlayPage eStartPage = static_cast<EHowToPlayPage>((uiInitData >> 16) & 0xFFF);		// Ignores MSB which is set to 1!
 
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, (ETelemetry_HowToPlay_SubMenuId)eStartPage);
 
@@ -216,10 +216,10 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 		if(pressed)
 		{
 			// Next page
-			int iNextPage = ( int )( m_eCurrPage ) + 1;
+			int iNextPage = static_cast<int>(m_eCurrPage) + 1;
 			if ( iNextPage != eHowToPlay_NumPages )
 			{
-				StartPage( ( EHowToPlayPage )( iNextPage ) );
+				StartPage( static_cast<EHowToPlayPage>(iNextPage) );
 				ui.PlayUISFX(eSFX_Press);
 			}
 			handled = true;
@@ -229,7 +229,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 		if(pressed)
 		{
 			// Previous page
-			int iPrevPage = ( int )( m_eCurrPage ) - 1;
+			int iPrevPage = static_cast<int>(m_eCurrPage) - 1;
 
 			// 4J Stu - Add back for future platforms
 #if 0
@@ -247,7 +247,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 			{
 				if ( iPrevPage >= 0 ) 
 				{
-					StartPage( ( EHowToPlayPage )( iPrevPage ) );
+					StartPage( static_cast<EHowToPlayPage>(iPrevPage) );
 					ui.PlayUISFX(eSFX_Press);
 				}
 
@@ -300,8 +300,8 @@ void UIScene_HowToPlay::StartPage( EHowToPlayPage ePage )
 	finalText = startTags + finalText;
 
 	vector<wstring> paragraphs;
-	int lastIndex = 0;
-	for (	int index = finalText.find(L"\r\n", lastIndex, 2);
+	size_t lastIndex = 0;
+	for (	size_t index = finalText.find(L"\r\n", lastIndex, 2);
 		index != wstring::npos; 
 		index = finalText.find(L"\r\n", lastIndex, 2)
 		)
@@ -318,7 +318,7 @@ void UIScene_HowToPlay::StartPage( EHowToPlayPage ePage )
 	IggyStringUTF16 * stringVal = new IggyStringUTF16[paragraphs.size()];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = gs_pageToFlashMapping[(int)ePage];
+	value[0].number = gs_pageToFlashMapping[static_cast<int>(ePage)];
 
 	for(unsigned int i = 0; i < paragraphs.size(); ++i)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp
index 92e8bdef..728bd4c0 100644
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp
@@ -122,7 +122,7 @@ void UIScene_HowToPlayMenu::updateTooltips()
 
 void UIScene_HowToPlayMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -191,13 +191,13 @@ void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, bool pre
 
 void UIScene_HowToPlayMenu::handlePress(F64 controlId, F64 childId)
 {
-	if( (int)controlId == eControl_Buttons)
+	if( static_cast<int>(controlId) == eControl_Buttons)
 	{
 		//CD - Added for audio
 		ui.PlayUISFX(eSFX_Press);
 
 		unsigned int uiInitData;
-		uiInitData = ( ( 1 <<  31 )  | ( m_uiHTPSceneA[(int)childId]  << 16 ) | ( short )( m_iPad ) );
+		uiInitData = ( ( 1 <<  31 )  | ( m_uiHTPSceneA[static_cast<int>(childId)]  << 16 ) | static_cast<short>(m_iPad) );
 		ui.NavigateToScene(m_iPad, eUIScene_HowToPlay, ( void* )( uiInitData ) );
 	}
 }
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
index 68ac537e..51992e32 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
@@ -126,7 +126,7 @@ void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat,
 				shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
 				if(player->connection)
 				{
-					player->connection->send( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, hostOptions) ) );
+					player->connection->send(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, hostOptions));
 				}
 			}
 
@@ -153,7 +153,7 @@ void UIScene_InGameHostOptionsMenu::handlePress(F64 controlId, F64 childId)
 	TeleportMenuInitData *initData = new TeleportMenuInitData();
 	initData->iPad = m_iPad;
 	initData->teleportToPlayer = false;
-	if( (int)controlId == eControl_TeleportToPlayer )
+	if( static_cast<int>(controlId) == eControl_TeleportToPlayer )
 	{
 		initData->teleportToPlayer = true;
 	}
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
index 57acf345..338d1905 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
@@ -23,7 +23,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			PlayerInfo *info = BuildPlayerInfo(player);
 
@@ -36,7 +36,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -109,7 +109,7 @@ void UIScene_InGameInfoMenu::updateTooltips()
 		{
 			keyA = IDS_TOOLTIPS_SELECT;
 		}
-		else if( selectedPlayer != NULL)
+		else if( selectedPlayer != nullptr)
 		{
 			bool editingHost = selectedPlayer->IsHost();
 			if( (cheats && (m_isHostPlayer || !editingHost ) ) || (!trust && (m_isHostPlayer || !editingHost))
@@ -134,7 +134,7 @@ void UIScene_InGameInfoMenu::updateTooltips()
 	if(!m_buttonGameOptions.hasFocus())
 	{
 		// if the player is me, then view gamer profile
-		if(selectedPlayer != NULL && selectedPlayer->IsLocal() && selectedPlayer->GetUserIndex()==m_iPad)
+		if(selectedPlayer != nullptr && selectedPlayer->IsLocal() && selectedPlayer->GetUserIndex()==m_iPad)
 		{
 			ikeyY = IDS_TOOLTIPS_VIEW_GAMERPROFILE;
 		}
@@ -150,8 +150,6 @@ void UIScene_InGameInfoMenu::updateTooltips()
 void UIScene_InGameInfoMenu::handleDestroy()
 {
 	g_NetworkManager.UnRegisterPlayerChangedCallback(m_iPad, &UIScene_InGameInfoMenu::OnPlayerChanged, this);
-
-	m_parentLayer->removeComponent(eUIComponent_MenuBackground);
 }
 
 void UIScene_InGameInfoMenu::handleGainFocus(bool navBack)
@@ -172,7 +170,7 @@ void UIScene_InGameInfoMenu::handleReload()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			PlayerInfo *info = BuildPlayerInfo(player);
 
@@ -183,7 +181,7 @@ void UIScene_InGameInfoMenu::handleReload()
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -209,7 +207,7 @@ void UIScene_InGameInfoMenu::tick()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if(player != NULL)
+		if(player != nullptr)
 		{
 			PlayerInfo *info = BuildPlayerInfo(player);
 
@@ -283,7 +281,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		if(pressed && m_playerList.hasFocus() && (m_playerList.getItemCount() > 0) && (m_playerList.getCurrentSelection() < m_players.size()) )
 		{
 			INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId(m_players[m_playerList.getCurrentSelection()]->m_smallId);
-			if( player != NULL )
+			if( player != nullptr )
 			{
 				PlayerUID uid = player->GetUID();
 				if( uid != INVALID_XUID )
@@ -327,14 +325,14 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 
 void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 {
-	app.DebugPrintf("Pressed = %d, %d\n", (int)controlId, (int)childId);
-	switch((int)controlId)
+	app.DebugPrintf("Pressed = %d, %d\n", static_cast<int>(controlId), static_cast<int>(childId));
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GameOptions:
 		ui.NavigateToScene(m_iPad,eUIScene_InGameHostOptionsMenu);
 		break;
 	case eControl_GamePlayers:
-		int currentSelection = (int)childId;
+		int currentSelection = static_cast<int>(childId);
 		INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId(m_players[currentSelection]->m_smallId);
 
 		Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -344,7 +342,7 @@ void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 		bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
 		bool trust = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 
-		if( isOp && selectedPlayer != NULL)
+		if( isOp && selectedPlayer != nullptr)
 		{
 			bool editingHost = selectedPlayer->IsHost();
 			if( (cheats && (m_isHostPlayer || !editingHost ) ) || (!trust && (m_isHostPlayer || !editingHost))
@@ -377,10 +375,10 @@ void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_InGameInfoMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamePlayers:
-		m_playerList.updateChildFocus( (int) childId );
+		m_playerList.updateChildFocus( static_cast<int>(childId) );
 	};
 	updateTooltips();
 }
@@ -389,7 +387,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
 {
 	app.DebugPrintf("<UIScene_InGameInfoMenu::OnPlayerChanged> Player \"%ls\" %s (smallId: %d)\n", pPlayer->GetOnlineName(), leaving ? "leaving" : "joining", pPlayer->GetSmallId());
 
-	UIScene_InGameInfoMenu *scene = (UIScene_InGameInfoMenu *)callbackParam;
+	UIScene_InGameInfoMenu *scene = static_cast<UIScene_InGameInfoMenu *>(callbackParam);
 	bool playerFound = false;
 	int foundIndex = 0;
 	for(int i = 0; i < scene->m_players.size(); ++i)
@@ -439,7 +437,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
 
 int UIScene_InGameInfoMenu::KickPlayerReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	BYTE smallId = *(BYTE *)pParam;
+	BYTE smallId = *static_cast<BYTE *>(pParam);
 	delete pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -448,7 +446,7 @@ int UIScene_InGameInfoMenu::KickPlayerReturned(void *pParam,int iPad,C4JStorage:
 		shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[iPad];
 		if(localPlayer->connection)
 		{
-			localPlayer->connection->send( shared_ptr<KickPlayerPacket>( new KickPlayerPacket(smallId) ) );
+			localPlayer->connection->send(std::make_shared<KickPlayerPacket>(smallId));
 		}
 	}
 
@@ -473,7 +471,7 @@ UIScene_InGameInfoMenu::PlayerInfo *UIScene_InGameInfoMenu::BuildPlayerInfo(INet
 	}
 
 	int voiceStatus = 0;
-	if(player != NULL && player->HasVoice() )
+	if(player != nullptr && player->HasVoice() )
 	{
 		if( player->IsMutedByLocalUser(m_iPad) )
 		{
diff --git a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
index d7196849..57937543 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
@@ -6,7 +6,6 @@
 #include "..\..\ClientConnection.h"
 #include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
-
 #define CHECKBOXES_TIMER_ID 0
 #define CHECKBOXES_TIMER_TIME 100
 
@@ -17,21 +16,21 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu(int iPad, void
 
 	m_bShouldNavBack = false;
 
-	InGamePlayerOptionsInitData *initData = (InGamePlayerOptionsInitData *)_initData;
+	InGamePlayerOptionsInitData *initData = static_cast<InGamePlayerOptionsInitData *>(_initData);
 	m_networkSmallId = initData->networkSmallId;
 	m_playerPrivileges = initData->playerPrivileges;
 
 	INetworkPlayer *localPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
 
-	if(editingPlayer != NULL)
+	if(editingPlayer != nullptr)
 	{
 		m_labelGamertag.init(editingPlayer->GetDisplayName());
 	}
 
 	bool trustPlayers = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 	bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
-	m_editingSelf = (localPlayer != NULL && localPlayer == editingPlayer);
+	m_editingSelf = (localPlayer != nullptr && localPlayer == editingPlayer);
 
 	if( m_editingSelf || trustPlayers || editingPlayer->IsHost())
 	{
@@ -61,7 +60,7 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu(int iPad, void
 
 	if(m_editingSelf)
 	{
-#if (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
+#ifndef _DEBUG // (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
 		removeControl( &m_checkboxes[eControl_Op], true );
 #else
 		m_checkboxes[eControl_Op].init(L"DEBUG: Creative",eControl_Op,Player::getPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CreativeMode));
@@ -241,7 +240,7 @@ void UIScene_InGamePlayerOptionsMenu::handleReload()
 
 	bool trustPlayers = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 	bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
-	m_editingSelf = (localPlayer != NULL && localPlayer == editingPlayer);
+	m_editingSelf = (localPlayer != nullptr && localPlayer == editingPlayer);
 
 	if( m_editingSelf || trustPlayers || editingPlayer->IsHost())
 	{
@@ -254,7 +253,7 @@ void UIScene_InGamePlayerOptionsMenu::handleReload()
 
 	if(m_editingSelf)
 	{
-#if (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
+#ifndef _DEBUG //(defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
 		removeControl( &m_checkboxes[eControl_Op], true );
 #endif
 		
@@ -348,7 +347,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 			bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
 			if(m_editingSelf)
 			{
-#if (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
+#ifndef _DEBUG // (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
 #else
 				Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CreativeMode,m_checkboxes[eControl_Op].IsChecked());
 #endif
@@ -372,7 +371,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 			else
 			{
 				INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
-				if(!trustPlayers && (editingPlayer != NULL && !editingPlayer->IsHost() ) )
+				if(!trustPlayers && (editingPlayer != nullptr && !editingPlayer->IsHost() ) )
 				{
 					Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CannotMine,!m_checkboxes[eControl_BuildAndMine].IsChecked());
 					Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CannotBuild,!m_checkboxes[eControl_BuildAndMine].IsChecked());
@@ -405,7 +404,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 				shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
 				if(player->connection)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( m_networkSmallId, -1, m_playerPrivileges) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(m_networkSmallId, -1, m_playerPrivileges));
 				}
 			}
 			navigateBack();
@@ -428,7 +427,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 
 void UIScene_InGamePlayerOptionsMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Kick:
 		{
@@ -446,7 +445,7 @@ void UIScene_InGamePlayerOptionsMenu::handlePress(F64 controlId, F64 childId)
 
 int UIScene_InGamePlayerOptionsMenu::KickPlayerReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	BYTE smallId = *(BYTE *)pParam;
+	BYTE smallId = *static_cast<BYTE *>(pParam);
 	delete pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -455,7 +454,7 @@ int UIScene_InGamePlayerOptionsMenu::KickPlayerReturned(void *pParam,int iPad,C4
 		shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[iPad];
 		if(localPlayer->connection)
 		{
-			localPlayer->connection->send( shared_ptr<KickPlayerPacket>( new KickPlayerPacket(smallId) ) );
+			localPlayer->connection->send(std::make_shared<KickPlayerPacket>(smallId));
 		}
 
 		// Fix for #61494 - [CRASH]: TU7: Code: Multiplayer: Title may crash while kicking a player from an online game.
@@ -470,12 +469,12 @@ int UIScene_InGamePlayerOptionsMenu::KickPlayerReturned(void *pParam,int iPad,C4
 void UIScene_InGamePlayerOptionsMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
 	app.DebugPrintf("UIScene_InGamePlayerOptionsMenu::OnPlayerChanged");
-	UIScene_InGamePlayerOptionsMenu *scene = (UIScene_InGamePlayerOptionsMenu *)callbackParam;
+	UIScene_InGamePlayerOptionsMenu *scene = static_cast<UIScene_InGamePlayerOptionsMenu *>(callbackParam);
 
-	UIScene_InGameInfoMenu *infoScene = (UIScene_InGameInfoMenu *)scene->getBackScene();
-	if(infoScene != NULL) UIScene_InGameInfoMenu::OnPlayerChanged(infoScene,pPlayer,leaving);
+	UIScene_InGameInfoMenu *infoScene = static_cast<UIScene_InGameInfoMenu *>(scene->getBackScene());
+	if(infoScene != nullptr) UIScene_InGameInfoMenu::OnPlayerChanged(infoScene,pPlayer,leaving);
 
-	if(leaving && pPlayer != NULL && pPlayer->GetSmallId() == scene->m_networkSmallId)
+	if(leaving && pPlayer != nullptr && pPlayer->GetSmallId() == scene->m_networkSmallId)
 	{
 		scene->m_bShouldNavBack = true;
 	}
@@ -497,7 +496,7 @@ void UIScene_InGamePlayerOptionsMenu::resetCheatCheckboxes()
 
 void UIScene_InGamePlayerOptionsMenu::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Op:
 		// flag that the moderator state has changed
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp
index fa2c7e61..fb118b15 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp
@@ -8,7 +8,7 @@
 
 int UIScene_InGameSaveManagementMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	UIScene_InGameSaveManagementMenu *pClass= (UIScene_InGameSaveManagementMenu *)lpParam;
+	UIScene_InGameSaveManagementMenu *pClass= static_cast<UIScene_InGameSaveManagementMenu *>(lpParam);
 
 	app.DebugPrintf("Received data for save thumbnail\n");
 
@@ -20,9 +20,9 @@ int UIScene_InGameSaveManagementMenu::LoadSaveDataThumbnailReturned(LPVOID lpPar
 	}
 	else
 	{
-		pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = NULL;
+		pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = nullptr;
 		pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].dwThumbnailSize = 0;
-		app.DebugPrintf("Save thumbnail data is NULL, or has size 0\n");
+		app.DebugPrintf("Save thumbnail data is nullptr, or has size 0\n");
 	}
 	pClass->m_bSaveThumbnailReady = true;
 
@@ -55,9 +55,9 @@ UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu(int iPad, voi
 	m_bRetrievingSaveThumbnails = false;
 	m_bSaveThumbnailReady = false;
 	m_bExitScene=false;
-	m_pSaveDetails=NULL;
+	m_pSaveDetails=nullptr;
 	m_bSavesDisplayed=false;
-	m_saveDetails = NULL;
+	m_saveDetails = nullptr;
 	m_iSaveDetailsCount = 0;
 
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) || defined(_DURANGO)
@@ -198,17 +198,17 @@ void UIScene_InGameSaveManagementMenu::tick()
 		if(!m_bSavesDisplayed)
 		{
 			m_pSaveDetails=StorageManager.ReturnSavesInfo();
-			if(m_pSaveDetails!=NULL)
+			if(m_pSaveDetails!=nullptr)
 			{
 				m_spaceIndicatorSaves.reset();
 
 				m_bSavesDisplayed=true;
 
-				if(m_saveDetails!=NULL)
+				if(m_saveDetails!=nullptr)
 				{
 					for(unsigned int i = 0; i < m_pSaveDetails->iSaveC; ++i)
 					{
-						if(m_saveDetails[i].pbThumbnailData!=NULL)
+						if(m_saveDetails[i].pbThumbnailData!=nullptr)
 						{
 							delete m_saveDetails[i].pbThumbnailData;
 						}
@@ -371,9 +371,9 @@ void UIScene_InGameSaveManagementMenu::GetSaveInfo(  )
 	m_controlSavesTimer.setVisible(true);
 
 	m_pSaveDetails=StorageManager.ReturnSavesInfo();
-	if(m_pSaveDetails==NULL)
+	if(m_pSaveDetails==nullptr)
 	{
-		C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save"); 
+		C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,nullptr,this,"save"); 
 	}
 
 
@@ -418,12 +418,12 @@ void UIScene_InGameSaveManagementMenu::handleInput(int iPad, int key, bool repea
 
 void UIScene_InGameSaveManagementMenu::handleInitFocus(F64 controlId, F64 childId)
 {
-	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId);
+	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleInitFocus - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 }
 
 void UIScene_InGameSaveManagementMenu::handleFocusChange(F64 controlId, F64 childId) 
 {
-	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId);
+	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleFocusChange - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 	m_iSaveListIndex = childId;
 	if(m_bSavesDisplayed) m_bUpdateSaveSize = true;
 	updateTooltips();
@@ -431,7 +431,7 @@ void UIScene_InGameSaveManagementMenu::handleFocusChange(F64 controlId, F64 chil
 
 void UIScene_InGameSaveManagementMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_SavesList:
 		{
@@ -452,7 +452,7 @@ void UIScene_InGameSaveManagementMenu::handlePress(F64 controlId, F64 childId)
 
 int UIScene_InGameSaveManagementMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_InGameSaveManagementMenu* pClass = (UIScene_InGameSaveManagementMenu*)pParam;
+	UIScene_InGameSaveManagementMenu* pClass = static_cast<UIScene_InGameSaveManagementMenu *>(pParam);
 	// results switched for this dialog
 
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -477,7 +477,7 @@ int UIScene_InGameSaveManagementMenu::DeleteSaveDialogReturned(void *pParam,int
 
 int UIScene_InGameSaveManagementMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 {
-	UIScene_InGameSaveManagementMenu* pClass = (UIScene_InGameSaveManagementMenu*)lpParam;
+	UIScene_InGameSaveManagementMenu* pClass = static_cast<UIScene_InGameSaveManagementMenu *>(lpParam);
 
 	if(bRes)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Common/UI/UIScene_Intro.cpp
index 7fc435b2..f4aefc40 100644
--- a/Minecraft.Client/Common/UI/UIScene_Intro.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Intro.cpp
@@ -83,17 +83,23 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, bo
 			case C4JStorage::eOptions_Callback_Read:
 			case C4JStorage::eOptions_Callback_Read_FileNotFound:
 				// we've either read it, or it wasn't found
+				#if 0
 				if(app.GetGameSettings(0,eGameSetting_PS3_EULA_Read)==0)
 				{
 					ui.NavigateToScene(0,eUIScene_EULA);
 				}
 				else
+				#endif
 				{
 					ui.NavigateToScene(0,eUIScene_SaveMessage);
 				}
 				break;
 			default:
-				ui.NavigateToScene(0,eUIScene_EULA);			
+				#if 0
+				ui.NavigateToScene(0,eUIScene_EULA);		
+				#else
+				ui.NavigateToScene(0,eUIScene_SaveMessage);	
+				#endif
 				break;
 			}
 #elif defined _XBOX_ONE
@@ -131,17 +137,23 @@ void UIScene_Intro::handleAnimationEnd()
 		case C4JStorage::eOptions_Callback_Read:
 		case C4JStorage::eOptions_Callback_Read_FileNotFound:
 			// we've either read it, or it wasn't found
+			#if 0
 			if(app.GetGameSettings(0,eGameSetting_PS3_EULA_Read)==0)
 			{
 				ui.NavigateToScene(0,eUIScene_EULA);
 			}
 			else
+			#endif
 			{
 				ui.NavigateToScene(0,eUIScene_SaveMessage);
 			}
 			break;
 		default:
-			ui.NavigateToScene(0,eUIScene_EULA);			
+			#if 0
+			ui.NavigateToScene(0,eUIScene_EULA);		
+			#else
+			ui.NavigateToScene(0,eUIScene_SaveMessage);	
+			#endif			
 		break;
 		}
 
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
index 4a9dab43..4e217c77 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
@@ -23,17 +23,17 @@ UIScene_InventoryMenu::UIScene_InventoryMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	InventoryScreenInput *initData = (InventoryScreenInput *)_initData;
+	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(_initData);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Inventory_Menu, this);
 	}
 
-	InventoryMenu *menu = (InventoryMenu *)initData->player->inventoryMenu;
+	InventoryMenu *menu = static_cast<InventoryMenu *>(initData->player->inventoryMenu);
 
 	initData->player->awardStat(GenericStats::openInventory(),GenericStats::param_openInventory());
 
@@ -182,7 +182,7 @@ void UIScene_InventoryMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryArmor:
@@ -201,7 +201,7 @@ void UIScene_InventoryMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_InventoryMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryArmor:
@@ -220,7 +220,7 @@ UIControl *UIScene_InventoryMenu::getSection(ESceneSection eSection)
 void UIScene_InventoryMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	if(wcscmp((wchar_t *)region->name,L"player")==0)
 	{
@@ -253,7 +253,7 @@ void UIScene_InventoryMenu::updateEffectsDisplay()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
 
-	if(player == NULL) return;
+	if(player == nullptr) return;
 
 	vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
 
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
index c036f7bf..417c1700 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
@@ -16,17 +16,24 @@ UIScene_JoinMenu::UIScene_JoinMenu(int iPad, void *_initData, UILayer *parentLay
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	JoinMenuInitData *initData = (JoinMenuInitData *)_initData;
+	JoinMenuInitData *initData = static_cast<JoinMenuInitData *>(_initData);
 	m_selectedSession = initData->selectedSession;
 	m_friendInfoUpdatedOK = false;
 	m_friendInfoUpdatedERROR = false;
 	m_friendInfoRequestIssued = false;
+#ifdef _WINDOWS64
+	m_serverIndex = initData->serverIndex;
+	m_editServerPhase = eEditServer_Idle;
+	m_editServerButtonIndex = -1;
+	m_deleteServerButtonIndex = -1;
+#endif
 }
 
 void UIScene_JoinMenu::updateTooltips()
 {
 	int iA = -1;
 	int iY = -1;
+	int iX = -1;
 	if (getControlFocus() == eControl_GamePlayers)
 	{
 #ifdef _DURANGO
@@ -38,7 +45,15 @@ void UIScene_JoinMenu::updateTooltips()
 		iA = IDS_TOOLTIPS_SELECT;
 	}
 
-	ui.SetTooltips( DEFAULT_XUI_MENU_USER, iA, IDS_TOOLTIPS_BACK, -1, iY );
+#ifdef _WINDOWS64
+	if (m_serverIndex >= 0)
+	{
+		iX = IDS_TOOLTIPS_DELETE;
+		iY = IDS_TITLE_RENAME;
+	}
+#endif
+
+	ui.SetTooltips( DEFAULT_XUI_MENU_USER, iA, IDS_TOOLTIPS_BACK, iX, iY );
 
 }
 
@@ -62,7 +77,7 @@ void UIScene_JoinMenu::tick()
 #if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
 		for( int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++ )
 		{
-			if( m_selectedSession->data.players[i] != NULL )
+			if( m_selectedSession->data.players[i] != nullptr )
 			{
 	#ifndef _CONTENT_PACKAGE
 				if(app.DebugSettingsOn() && (app.GetGameSettingsDebugMask()&(1L<<eDebugSetting_DebugLeaderboards)))
@@ -88,7 +103,7 @@ void UIScene_JoinMenu::tick()
 			}
 			else
 			{
-				// Leave the loop when we hit the first NULL player
+				// Leave the loop when we hit the first nullptr player
 				break;
 			}
 		}
@@ -107,6 +122,16 @@ void UIScene_JoinMenu::tick()
 		}
 #endif
 
+#ifdef _WINDOWS64
+		if (m_serverIndex >= 0)
+		{
+			m_editServerButtonIndex = m_buttonListPlayers.getItemCount();
+			m_buttonListPlayers.addItem(L"Edit Server");
+			m_deleteServerButtonIndex = m_buttonListPlayers.getItemCount();
+			m_buttonListPlayers.addItem(L"Delete Server");
+		}
+#endif
+
 		m_labelLabels[eLabel_Difficulty].init(app.GetString(IDS_LABEL_DIFFICULTY));
 		m_labelLabels[eLabel_GameType].init(app.GetString(IDS_LABEL_GAME_TYPE));
 		m_labelLabels[eLabel_GamertagsOn].init(app.GetString(IDS_LABEL_GAMERTAGS));
@@ -224,7 +249,7 @@ void UIScene_JoinMenu::tick()
 
 void UIScene_JoinMenu::friendSessionUpdated(bool success, void *pParam)
 {
-	UIScene_JoinMenu *scene = (UIScene_JoinMenu *)pParam;
+	UIScene_JoinMenu *scene = static_cast<UIScene_JoinMenu *>(pParam);
 	ui.NavigateBack(scene->m_iPad);
 	if( success )
 	{
@@ -238,7 +263,7 @@ void UIScene_JoinMenu::friendSessionUpdated(bool success, void *pParam)
 
 int UIScene_JoinMenu::ErrorDialogReturned(void *pParam, int iPad, const C4JStorage::EMessageResult)
 {
-	UIScene_JoinMenu *scene = (UIScene_JoinMenu *)pParam;
+	UIScene_JoinMenu *scene = static_cast<UIScene_JoinMenu *>(pParam);
 	ui.NavigateBack(scene->m_iPad);
 
 	return 0;
@@ -272,18 +297,44 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 		break;
 #ifdef _DURANGO
 	case ACTION_MENU_Y:
-		if(m_selectedSession != NULL && getControlFocus() == eControl_GamePlayers && m_buttonListPlayers.getItemCount() > 0)
+		if(m_selectedSession != nullptr && getControlFocus() == eControl_GamePlayers && m_buttonListPlayers.getItemCount() > 0)
 		{
 			PlayerUID uid = m_selectedSession->searchResult.m_playerXuids[m_buttonListPlayers.getCurrentSelection()];
 			if( uid != INVALID_XUID ) ProfileManager.ShowProfileCard(ProfileManager.GetLockedProfile(),uid);
 		}
 		break;
 #endif
+#ifdef _WINDOWS64
+	case ACTION_MENU_X:
+		if(pressed && m_serverIndex >= 0)
+		{
+			BeginDeleteServer();
+			handled = true;
+		}
+		break;
+	case ACTION_MENU_Y:
+		if(pressed && m_serverIndex >= 0)
+		{
+			BeginEditServer();
+			handled = true;
+		}
+		break;
+#endif
 	case ACTION_MENU_OK:
 		if (getControlFocus() != eControl_GamePlayers)
 		{
 			sendInputToMovie(key, repeat, pressed, released);
 		}
+#ifdef _WINDOWS64
+		else if (pressed && m_serverIndex >= 0)
+		{
+			int sel = m_buttonListPlayers.getCurrentSelection();
+			if (sel == m_editServerButtonIndex)
+				BeginEditServer();
+			else if (sel == m_deleteServerButtonIndex)
+				BeginDeleteServer();
+		}
+#endif
 		handled = true;
 		break;
 #ifdef __ORBIS__
@@ -301,7 +352,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 
 void UIScene_JoinMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_JoinGame:
 		{
@@ -318,16 +369,26 @@ void UIScene_JoinMenu::handlePress(F64 controlId, F64 childId)
 		}
 		break;
 	case eControl_GamePlayers:
+#ifdef _WINDOWS64
+		if (m_serverIndex >= 0)
+		{
+			int sel = (int)childId;
+			if (sel == m_editServerButtonIndex)
+				BeginEditServer();
+			else if (sel == m_deleteServerButtonIndex)
+				BeginDeleteServer();
+		}
+#endif
 		break;
 	};
 }
 
 void UIScene_JoinMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamePlayers:
-		m_buttonListPlayers.updateChildFocus( (int) childId );
+		m_buttonListPlayers.updateChildFocus( static_cast<int>(childId) );
 	};
 	updateTooltips();
 }
@@ -370,7 +431,7 @@ void UIScene_JoinMenu::StartSharedLaunchFlow()
 
 int UIScene_JoinMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
+	UIScene_JoinMenu* pClass = static_cast<UIScene_JoinMenu *>(ui.GetSceneFromCallbackId((size_t)pParam));
 
 	if(pClass)
 	{
@@ -473,7 +534,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 #if defined(__PS3__) || defined(__PSVITA__)
 	if(isSignedInLive)
 	{
-		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&noUGC,NULL,NULL);
+		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&noUGC,nullptr,nullptr);
 	}
 #else
 	ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
@@ -511,7 +572,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 	{
 #if defined(__ORBIS__) || defined(__PSVITA__)
 		bool chatRestricted = false;
-		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 		if(chatRestricted)
 		{
 			ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -534,6 +595,48 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 
 			if( exitReasonStringId == -1 )
 			{
+				Minecraft* pMinecraft = Minecraft::GetInstance();
+				int primaryPad = ProfileManager.GetPrimaryPad();
+				if( pMinecraft->m_connectionFailed[primaryPad] )
+				{
+					switch( pMinecraft->m_connectionFailedReason[primaryPad] )
+					{
+					case DisconnectPacket::eDisconnect_LoginTooLong:
+						exitReasonStringId = IDS_DISCONNECTED_LOGIN_TOO_LONG;
+						break;
+					case DisconnectPacket::eDisconnect_ServerFull:
+						exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL;
+						break;
+					case DisconnectPacket::eDisconnect_Kicked:
+						exitReasonStringId = IDS_DISCONNECTED_KICKED;
+						break;
+					case DisconnectPacket::eDisconnect_NoUGC_AllLocal:
+						exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
+						break;
+					case DisconnectPacket::eDisconnect_NoUGC_Single_Local:
+						exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL;
+						break;
+					case DisconnectPacket::eDisconnect_NoFlying:
+						exitReasonStringId = IDS_DISCONNECTED_FLYING;
+						break;
+					case DisconnectPacket::eDisconnect_Quitting:
+						exitReasonStringId = IDS_DISCONNECTED_SERVER_QUIT;
+						break;
+					case DisconnectPacket::eDisconnect_OutdatedServer:
+						exitReasonStringId = IDS_DISCONNECTED_SERVER_OLD;
+						break;
+					case DisconnectPacket::eDisconnect_OutdatedClient:
+						exitReasonStringId = IDS_DISCONNECTED_CLIENT_OLD;
+						break;
+					default:
+						exitReasonStringId = IDS_CONNECTION_LOST_SERVER;
+						break;
+					}
+				}
+			}
+
+			if( exitReasonStringId == -1 )
+			{
 				ui.NavigateBack(pClass->m_iPad);
 			}
 			else
@@ -566,7 +669,7 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 				int selectedIndex = 0;
 				for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
 				{
-					if( m_selectedSession->data.players[i] != NULL )
+					if( m_selectedSession->data.players[i] != nullptr )
 					{
 						if(m_selectedSession->data.players[i] == selectedPlayerXUID) selectedIndex = i;
 						playersList.InsertItems(i,1);
@@ -583,7 +686,7 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 					}
 					else
 					{
-						// Leave the loop when we hit the first NULL player
+						// Leave the loop when we hit the first nullptr player
 						break;
 					}
 				}
@@ -593,4 +696,279 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 		}
 		break;
 	};
-}
\ No newline at end of file
+}
+
+#ifdef _WINDOWS64
+void UIScene_JoinMenu::BeginDeleteServer()
+{
+	m_bIgnoreInput = true;
+	UINT uiIDA[2];
+	uiIDA[0] = IDS_CONFIRM_CANCEL;
+	uiIDA[1] = IDS_CONFIRM_OK;
+	ui.RequestAlertMessage(IDS_TOOLTIPS_DELETE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, m_iPad, &UIScene_JoinMenu::DeleteServerDialogReturned, this);
+}
+
+int UIScene_JoinMenu::DeleteServerDialogReturned(void *pParam, int iPad, C4JStorage::EMessageResult result)
+{
+	UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)pParam;
+
+	if (result == C4JStorage::EMessage_ResultDecline)
+	{
+		pClass->RemoveServerFromFile();
+		g_NetworkManager.ForceFriendsSessionRefresh();
+		pClass->navigateBack();
+	}
+	else
+	{
+		pClass->m_bIgnoreInput = false;
+	}
+
+	return 0;
+}
+
+void UIScene_JoinMenu::BeginEditServer()
+{
+	m_bIgnoreInput = true;
+	m_editServerPhase = eEditServer_IP;
+	m_editServerIP.clear();
+	m_editServerPort.clear();
+
+	wchar_t wDefaultIP[64] = {};
+	mbstowcs(wDefaultIP, m_selectedSession->data.hostIP, 63);
+
+	UIKeyboardInitData kbData;
+	kbData.title       = L"Server Address";
+	kbData.defaultText = wDefaultIP;
+	kbData.maxChars    = 128;
+	kbData.callback    = &UIScene_JoinMenu::EditServerKeyboardCallback;
+	kbData.lpParam     = this;
+	kbData.pcMode      = g_KBMInput.IsKBMActive();
+	ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
+}
+
+int UIScene_JoinMenu::EditServerKeyboardCallback(LPVOID lpParam, bool bRes)
+{
+	UIScene_JoinMenu *pClass = (UIScene_JoinMenu *)lpParam;
+
+	if (!bRes)
+	{
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+		return 0;
+	}
+
+	uint16_t ui16Text[256];
+	ZeroMemory(ui16Text, sizeof(ui16Text));
+	Win64_GetKeyboardText(ui16Text, 256);
+
+	wchar_t wBuf[256] = {};
+	for (int k = 0; k < 255 && ui16Text[k]; k++)
+		wBuf[k] = (wchar_t)ui16Text[k];
+
+	if (wBuf[0] == 0)
+	{
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+		return 0;
+	}
+
+	switch (pClass->m_editServerPhase)
+	{
+	case eEditServer_IP:
+	{
+		pClass->m_editServerIP = wBuf;
+		pClass->m_editServerPhase = eEditServer_Port;
+
+		wchar_t wDefaultPort[16] = {};
+		swprintf(wDefaultPort, 16, L"%d", pClass->m_selectedSession->data.hostPort);
+
+		UIKeyboardInitData kbData;
+		kbData.title       = L"Server Port";
+		kbData.defaultText = wDefaultPort;
+		kbData.maxChars    = 6;
+		kbData.callback    = &UIScene_JoinMenu::EditServerKeyboardCallback;
+		kbData.lpParam     = pClass;
+		kbData.pcMode      = g_KBMInput.IsKBMActive();
+		ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+		break;
+	}
+	case eEditServer_Port:
+	{
+		pClass->m_editServerPort = wBuf;
+		pClass->m_editServerPhase = eEditServer_Name;
+
+		wchar_t wDefaultName[64] = {};
+		if (pClass->m_selectedSession->displayLabel)
+			wcsncpy(wDefaultName, pClass->m_selectedSession->displayLabel, 63);
+
+		UIKeyboardInitData kbData;
+		kbData.title       = L"Server Name";
+		kbData.defaultText = wDefaultName;
+		kbData.maxChars    = 64;
+		kbData.callback    = &UIScene_JoinMenu::EditServerKeyboardCallback;
+		kbData.lpParam     = pClass;
+		kbData.pcMode      = g_KBMInput.IsKBMActive();
+		ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+		break;
+	}
+	case eEditServer_Name:
+	{
+		wstring newName = wBuf;
+		pClass->UpdateServerInFile(pClass->m_editServerIP, pClass->m_editServerPort, newName);
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+
+		g_NetworkManager.ForceFriendsSessionRefresh();
+		pClass->navigateBack();
+		break;
+	}
+	default:
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+		break;
+	}
+
+	return 0;
+}
+
+void UIScene_JoinMenu::UpdateServerInFile(const wstring& newIP, const wstring& newPort, const wstring& newName)
+{
+	char narrowNewIP[256] = {};
+	char narrowNewPort[16] = {};
+	char narrowNewName[256] = {};
+	wcstombs(narrowNewIP, newIP.c_str(), sizeof(narrowNewIP) - 1);
+	wcstombs(narrowNewPort, newPort.c_str(), sizeof(narrowNewPort) - 1);
+	wcstombs(narrowNewName, newName.c_str(), sizeof(narrowNewName) - 1);
+
+	uint16_t newPortNum = (uint16_t)atoi(narrowNewPort);
+
+	struct ServerEntry { std::string ip; uint16_t port; std::string name; };
+	std::vector<ServerEntry> entries;
+
+	FILE* file = fopen("servers.db", "rb");
+	if (file)
+	{
+		char magic[4] = {};
+		if (fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+		{
+			uint32_t version = 0, count = 0;
+			fread(&version, sizeof(uint32_t), 1, file);
+			fread(&count, sizeof(uint32_t), 1, file);
+			if (version == 1)
+			{
+				for (uint32_t s = 0; s < count; s++)
+				{
+					uint16_t ipLen = 0, p = 0, nameLen = 0;
+					if (fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (ipLen == 0 || ipLen > 256) break;
+					char ipBuf[257] = {};
+					if (fread(ipBuf, 1, ipLen, file) != ipLen) break;
+					if (fread(&p, sizeof(uint16_t), 1, file) != 1) break;
+					if (fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (nameLen > 256) break;
+					char nameBuf[257] = {};
+					if (nameLen > 0 && fread(nameBuf, 1, nameLen, file) != nameLen) break;
+					entries.push_back({std::string(ipBuf), p, std::string(nameBuf)});
+				}
+			}
+		}
+		fclose(file);
+	}
+
+	// Find and update the matching entry by original IP and port
+	int idx = m_serverIndex;
+	if (idx >= 0 && idx < (int)entries.size())
+	{
+		entries[idx].ip = std::string(narrowNewIP);
+		entries[idx].port = newPortNum;
+		entries[idx].name = std::string(narrowNewName);
+	}
+
+	file = fopen("servers.db", "wb");
+	if (file)
+	{
+		fwrite("MCSV", 1, 4, file);
+		uint32_t version = 1;
+		uint32_t count = (uint32_t)entries.size();
+		fwrite(&version, sizeof(uint32_t), 1, file);
+		fwrite(&count, sizeof(uint32_t), 1, file);
+
+		for (size_t i = 0; i < entries.size(); i++)
+		{
+			uint16_t ipLen = (uint16_t)entries[i].ip.length();
+			fwrite(&ipLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].ip.c_str(), 1, ipLen, file);
+			fwrite(&entries[i].port, sizeof(uint16_t), 1, file);
+			uint16_t nameLen = (uint16_t)entries[i].name.length();
+			fwrite(&nameLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].name.c_str(), 1, nameLen, file);
+		}
+		fclose(file);
+	}
+}
+
+void UIScene_JoinMenu::RemoveServerFromFile()
+{
+	struct ServerEntry { std::string ip; uint16_t port; std::string name; };
+	std::vector<ServerEntry> entries;
+
+	FILE* file = fopen("servers.db", "rb");
+	if (file)
+	{
+		char magic[4] = {};
+		if (fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+		{
+			uint32_t version = 0, count = 0;
+			fread(&version, sizeof(uint32_t), 1, file);
+			fread(&count, sizeof(uint32_t), 1, file);
+			if (version == 1)
+			{
+				for (uint32_t s = 0; s < count; s++)
+				{
+					uint16_t ipLen = 0, p = 0, nameLen = 0;
+					if (fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (ipLen == 0 || ipLen > 256) break;
+					char ipBuf[257] = {};
+					if (fread(ipBuf, 1, ipLen, file) != ipLen) break;
+					if (fread(&p, sizeof(uint16_t), 1, file) != 1) break;
+					if (fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (nameLen > 256) break;
+					char nameBuf[257] = {};
+					if (nameLen > 0 && fread(nameBuf, 1, nameLen, file) != nameLen) break;
+					entries.push_back({std::string(ipBuf), p, std::string(nameBuf)});
+				}
+			}
+		}
+		fclose(file);
+	}
+
+	// Remove the entry at m_serverIndex
+	int idx = m_serverIndex;
+	if (idx >= 0 && idx < (int)entries.size())
+	{
+		entries.erase(entries.begin() + idx);
+	}
+
+	file = fopen("servers.db", "wb");
+	if (file)
+	{
+		fwrite("MCSV", 1, 4, file);
+		uint32_t version = 1;
+		uint32_t count = (uint32_t)entries.size();
+		fwrite(&version, sizeof(uint32_t), 1, file);
+		fwrite(&count, sizeof(uint32_t), 1, file);
+
+		for (size_t i = 0; i < entries.size(); i++)
+		{
+			uint16_t ipLen = (uint16_t)entries[i].ip.length();
+			fwrite(&ipLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].ip.c_str(), 1, ipLen, file);
+			fwrite(&entries[i].port, sizeof(uint16_t), 1, file);
+			uint16_t nameLen = (uint16_t)entries[i].name.length();
+			fwrite(&nameLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].name.c_str(), 1, nameLen, file);
+		}
+		fclose(file);
+	}
+}
+#endif // _WINDOWS64
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.h b/Minecraft.Client/Common/UI/UIScene_JoinMenu.h
index 817360ef..566697cd 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.h
@@ -62,6 +62,16 @@ private:
 	bool m_friendInfoUpdatedOK;
 	bool m_friendInfoUpdatedERROR;
 
+#ifdef _WINDOWS64
+	int m_serverIndex; // Index in servers.db, -1 if not a saved server
+	enum eEditServerPhase { eEditServer_Idle, eEditServer_IP, eEditServer_Port, eEditServer_Name };
+	eEditServerPhase m_editServerPhase;
+	wstring m_editServerIP;
+	wstring m_editServerPort;
+	int m_editServerButtonIndex;
+	int m_deleteServerButtonIndex;
+#endif
+
 public:
 	UIScene_JoinMenu(int iPad, void *initData, UILayer *parentLayer);
 	void tick();
@@ -95,4 +105,13 @@ protected:
 	
 	static int StartGame_SignInReturned(void *pParam, bool, int);
 	static void JoinGame(UIScene_JoinMenu* pClass);
+
+#ifdef _WINDOWS64
+	void BeginEditServer();
+	void BeginDeleteServer();
+	static int EditServerKeyboardCallback(LPVOID lpParam, bool bRes);
+	static int DeleteServerDialogReturned(void *pParam, int iPad, C4JStorage::EMessageResult result);
+	void UpdateServerInFile(const wstring& newIP, const wstring& newPort, const wstring& newName);
+	void RemoveServerFromFile();
+#endif
 };
diff --git a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
index 9e46a42e..2f2f9132 100644
--- a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
@@ -17,8 +17,8 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 	initialiseMovie();
 
 #ifdef _WINDOWS64
-	m_win64Callback = NULL;
-	m_win64CallbackParam = NULL;
+	m_win64Callback = nullptr;
+	m_win64CallbackParam = nullptr;
 	m_win64TextBuffer = L"";
 	m_win64MaxChars = 25;
 
@@ -28,7 +28,7 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 	m_bPCMode = false;
 	if (initData)
 	{
-		UIKeyboardInitData* kbData = (UIKeyboardInitData*)initData;
+		UIKeyboardInitData* kbData = static_cast<UIKeyboardInitData *>(initData);
 		m_win64Callback = kbData->callback;
 		m_win64CallbackParam = kbData->lpParam;
 		if (kbData->title)       titleText        = kbData->title;
@@ -38,6 +38,7 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 	}
 
 	m_win64TextBuffer = defaultText;
+	m_iCursorPos = (int)m_win64TextBuffer.length();
 
 	m_EnterTextLabel.init(titleText);
 	m_KeyboardTextInput.init(defaultText, -1);
@@ -105,12 +106,15 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 		};
 		IggyName nameVisible = registerFastName(L"visible");
 		IggyValuePath* root = IggyPlayerRootPath(getMovie());
-		for (int i = 0; i < (int)(sizeof(s_keyNames) / sizeof(s_keyNames[0])); ++i)
+		for (int i = 0; i < static_cast<int>(sizeof(s_keyNames) / sizeof(s_keyNames[0])); ++i)
 		{
 			IggyValuePath keyPath;
 			if (IggyValuePathMakeNameRef(&keyPath, root, s_keyNames[i]))
-				IggyValueSetBooleanRS(&keyPath, nameVisible, NULL, false);
+				IggyValueSetBooleanRS(&keyPath, nameVisible, nullptr, false);
 		}
+
+		m_KeyboardTextInput.setCaretVisible(true);
+		m_KeyboardTextInput.setCaretIndex(m_iCursorPos);
 	}
 #endif
 
@@ -163,6 +167,16 @@ void UIScene_Keyboard::tick()
 {
 	UIScene::tick();
 
+	// Sync our buffer from Flash so we pick up changes made via controller/on-screen buttons.
+	// Without this, switching between controller and keyboard would use stale text.
+	// In PC mode we own the buffer — skip sync to preserve cursor position.
+	if (!m_bPCMode)
+	{
+		const wchar_t* flashText = m_KeyboardTextInput.getLabel();
+		if (flashText)
+			m_win64TextBuffer = flashText;
+	}
+
 	// Accumulate physical keyboard chars into our own buffer, then push to Flash via setLabel.
 	// This bypasses Iggy's focus system (char events only route to the focused element).
 	// The char buffer is cleared on open so Enter/clicks from the triggering action don't leak in.
@@ -172,7 +186,16 @@ void UIScene_Keyboard::tick()
 	{
 		if (ch == 0x08) // backspace
 		{
-			if (!m_win64TextBuffer.empty())
+			if (m_bPCMode)
+			{
+				if (m_iCursorPos > 0)
+				{
+					m_win64TextBuffer.erase(m_iCursorPos - 1, 1);
+					m_iCursorPos--;
+					changed = true;
+				}
+			}
+			else if (!m_win64TextBuffer.empty())
 			{
 				m_win64TextBuffer.pop_back();
 				changed = true;
@@ -186,15 +209,47 @@ void UIScene_Keyboard::tick()
 				m_bKeyboardDonePressed = true;
 			}
 		}
-		else if ((int)m_win64TextBuffer.length() < m_win64MaxChars)
+		else if (static_cast<int>(m_win64TextBuffer.length()) < m_win64MaxChars)
 		{
-			m_win64TextBuffer += ch;
+			if (m_bPCMode)
+			{
+				m_win64TextBuffer.insert(m_iCursorPos, 1, ch);
+				m_iCursorPos++;
+			}
+			else
+			{
+				m_win64TextBuffer += ch;
+			}
+			changed = true;
+		}
+	}
+
+	if (m_bPCMode)
+	{
+		// Arrow keys, Home, End, Delete for cursor movement
+		if (g_KBMInput.IsKeyPressed(VK_LEFT) && m_iCursorPos > 0)
+			m_iCursorPos--;
+		if (g_KBMInput.IsKeyPressed(VK_RIGHT) && m_iCursorPos < (int)m_win64TextBuffer.length())
+			m_iCursorPos++;
+		if (g_KBMInput.IsKeyPressed(VK_HOME))
+			m_iCursorPos = 0;
+		if (g_KBMInput.IsKeyPressed(VK_END))
+			m_iCursorPos = (int)m_win64TextBuffer.length();
+		if (g_KBMInput.IsKeyPressed(VK_DELETE) && m_iCursorPos < (int)m_win64TextBuffer.length())
+		{
+			m_win64TextBuffer.erase(m_iCursorPos, 1);
 			changed = true;
 		}
 	}
 
 	if (changed)
 		m_KeyboardTextInput.setLabel(m_win64TextBuffer.c_str(), true /*instant*/);
+
+	if (m_bPCMode)
+	{
+		m_KeyboardTextInput.setCaretVisible(true);
+		m_KeyboardTextInput.setCaretIndex(m_iCursorPos);
+	}
 }
 #endif
 
@@ -223,33 +278,37 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
 			handled = true;
 			break;
 		case ACTION_MENU_X:					// X
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcBackspaceButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_PAGEUP:			// LT
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSymbolButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_Y:					// Y
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSpaceButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_STICK_PRESS:		// LS
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCapsButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_LEFT_SCROLL:		// LB
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorLeftButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_RIGHT_SCROLL:		// RB
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorRightButtonPressed, 0 , NULL );
+#ifdef _WINDOWS64
+
+			if (m_bPCMode)
+			{
+				handled = true;
+				break;
+			}
+#endif
+			if (key == ACTION_MENU_X)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcBackspaceButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_PAGEUP)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSymbolButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_Y)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSpaceButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_STICK_PRESS)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCapsButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_LEFT_SCROLL)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorLeftButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_RIGHT_SCROLL)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorRightButtonPressed, 0 , nullptr);
 			handled = true;
 			break;
 		case ACTION_MENU_PAUSEMENU:			// Start
 			if(!m_bKeyboardDonePressed)
 			{
-				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcDoneButtonPressed, 0 , NULL );
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcDoneButtonPressed, 0 , nullptr );
 				
 				// kick off done timer
 				addTimer(KEYBOARD_DONE_TIMER_ID,KEYBOARD_DONE_TIMER_TIME);
@@ -263,11 +322,23 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
 	switch(key)
 	{
 	case ACTION_MENU_OK:
+#ifdef _WINDOWS64
+		if (m_bPCMode)
+		{
+			// pressing enter sometimes causes a "y" to be entered.
+			handled = true;
+			break;
+		}
+#endif
+		// fall through for controller mode
 	case ACTION_MENU_LEFT:
 	case ACTION_MENU_RIGHT:
 	case ACTION_MENU_UP:
 	case ACTION_MENU_DOWN:
-		sendInputToMovie(key, repeat, pressed, released);
+#ifdef _WINDOWS64
+		if (!m_bPCMode)
+#endif
+			sendInputToMovie(key, repeat, pressed, released);
 		handled = true;
 		break;
 	}
@@ -275,7 +346,7 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
 
 void UIScene_Keyboard::handlePress(F64 controlId, F64 childId)
 {
-	if((int)controlId == 0)
+	if(static_cast<int>(controlId) == 0)
 	{
 		// Done has been pressed. At this point we can query for the input string and pass it on to wherever it is needed.
 		// we can not query for m_KeyboardTextInput.getLabel() here because we're in an iggy callback so we need to wait a frame.
diff --git a/Minecraft.Client/Common/UI/UIScene_Keyboard.h b/Minecraft.Client/Common/UI/UIScene_Keyboard.h
index 054322f2..146934c1 100644
--- a/Minecraft.Client/Common/UI/UIScene_Keyboard.h
+++ b/Minecraft.Client/Common/UI/UIScene_Keyboard.h
@@ -13,6 +13,7 @@ private:
 	wstring m_win64TextBuffer;
 	int m_win64MaxChars;
 	bool m_bPCMode; // Hides on-screen keyboard buttons; physical keyboard only
+	int m_iCursorPos;
 #endif
 
 protected:
diff --git a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp
index e9dc7eb9..c2a30d3c 100644
--- a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp
@@ -58,7 +58,7 @@ void UIScene_LanguageSelector::updateTooltips()
 
 void UIScene_LanguageSelector::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -112,18 +112,18 @@ void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, bool
 
 void UIScene_LanguageSelector::handlePress(F64 controlId, F64 childId)
 {
-	if( (int)controlId == eControl_Buttons )
+	if( static_cast<int>(controlId) == eControl_Buttons )
 	{
 		//CD - Added for audio
 		ui.PlayUISFX(eSFX_Press);
 
 		int newLanguage, newLocale;
-		newLanguage = uiLangMap[(int)childId];
-		newLocale =	uiLocaleMap[(int)childId];
+		newLanguage = uiLangMap[static_cast<int>(childId)];
+		newLocale =	uiLocaleMap[static_cast<int>(childId)];
 
 		app.SetMinecraftLanguage(m_iPad, newLanguage);
 		app.SetMinecraftLocale(m_iPad, newLocale);
 
 		app.CheckGameSettingsChanged(true, m_iPad);
 	}
-}
+}
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
index d6f89832..b2981ebf 100644
--- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
@@ -20,7 +20,7 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(int iPad, void *ini
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_params = (LaunchMoreOptionsMenuInitData *)initData;
+	m_params = static_cast<LaunchMoreOptionsMenuInitData *>(initData);
 
 	m_labelWorldOptions.init(app.GetString(IDS_WORLD_OPTIONS));
 
@@ -116,9 +116,9 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(int iPad, void *ini
 	if(m_params->currentWorldSize != e_worldSize_Unknown)
 	{
 		m_labelWorldResize.init(app.GetString(IDS_INCREASE_WORLD_SIZE));
-		int min= int(m_params->currentWorldSize)-1;
+		int min= static_cast<int>(m_params->currentWorldSize)-1;
 		int max=3;
-		int curr = int(m_params->newWorldSize)-1;
+		int curr = static_cast<int>(m_params->newWorldSize)-1;
 		m_sliderWorldResize.init(app.GetString(m_iWorldSizeTitleA[curr]),eControl_WorldResize,min,max,curr);
 		m_checkboxes[eLaunchCheckbox_WorldResizeType].init(app.GetString(IDS_INCREASE_WORLD_SIZE_OVERWRITE_EDGES),eLaunchCheckbox_WorldResizeType,m_params->newWorldSizeOverwriteEdges);
 	}
@@ -257,6 +257,9 @@ void UIScene_LaunchMoreOptionsMenu::handleDestroy()
 void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if(m_bIgnoreInput) return;
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
 
 	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
@@ -305,7 +308,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat,
 			m_tabIndex = m_tabIndex == 0 ? 1 : 0;
 			updateTooltips();
 			IggyDataValue result;
-			IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , NULL );
+			IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr );
 		}
 		break;
 	}
@@ -327,14 +330,16 @@ void UIScene_LaunchMoreOptionsMenu::handleTouchInput(unsigned int iPad, S32 x, S
 				m_tabIndex = iNewTabIndex;
 				updateTooltips();
 				IggyDataValue result;
-				IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , NULL );
+				IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr );
 			}
 			ui.TouchBoxRebuild(this);
 			break;
 		}
 	}
 }
+#endif
 
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 UIControl* UIScene_LaunchMoreOptionsMenu::GetMainPanel()
 {
 	if(m_tabIndex == 0)
@@ -349,7 +354,7 @@ void UIScene_LaunchMoreOptionsMenu::handleCheckboxToggled(F64 controlId, bool se
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((EControls)((int)controlId))
+	switch(static_cast<EControls>((int)controlId))
 	{
 	case eLaunchCheckbox_Online:
 		m_params->bOnlineGame = selected;
@@ -423,7 +428,7 @@ void UIScene_LaunchMoreOptionsMenu::handleCheckboxToggled(F64 controlId, bool se
 void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId, F64 childId)
 {
 	int stringId = 0;
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eLaunchCheckbox_Online:
 		stringId = IDS_GAMEOPTION_ONLINE;
@@ -544,13 +549,18 @@ void UIScene_LaunchMoreOptionsMenu::handleTimerComplete(int id)
 
 int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_LaunchMoreOptionsMenu *pClass=(UIScene_LaunchMoreOptionsMenu *)lpParam;
+	UIScene_LaunchMoreOptionsMenu *pClass=static_cast<UIScene_LaunchMoreOptionsMenu *>(lpParam);
 	pClass->m_bIgnoreInput=false;
-	// 4J HEG - No reason to set value if keyboard was cancelled
 	if (bRes)
 	{
+#ifdef _WINDOWS64
+		uint16_t pchText[128];
+		ZeroMemory(pchText, 128 * sizeof(uint16_t));
+		Win64_GetKeyboardText(pchText, 128);
+		pClass->m_editSeed.setLabel((wchar_t *)pchText);
+		pClass->m_params->seed = (wchar_t *)pchText;
+#else
 #ifdef __PSVITA__
-		//CD - Changed to 2048 [SCE_IME_MAX_TEXT_LENGTH]
 		uint16_t pchText[2048];
 		ZeroMemory(pchText, 2048 * sizeof(uint16_t) );
 #else
@@ -560,18 +570,52 @@ int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(LPVOID lpParam,b
 		InputManager.GetText(pchText);
 		pClass->m_editSeed.setLabel((wchar_t *)pchText);
 		pClass->m_params->seed = (wchar_t *)pchText;
+#endif
 	}
 	return 0;
 }
 
+#ifdef _WINDOWS64
+void UIScene_LaunchMoreOptionsMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_editSeed);
+}
+
+void UIScene_LaunchMoreOptionsMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	if (result == UIControl_TextInput::eDirectEdit_Confirmed)
+		m_params->seed = input->getEditBuffer();
+}
+#endif
+
 void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
 {
 	if(m_bIgnoreInput) return;
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_EditSeed:
 		{
+#ifdef _WINDOWS64
+			if (g_KBMInput.IsKBMActive())
+			{
+				m_editSeed.beginDirectEdit(60);
+			}
+			else
+			{
+				m_bIgnoreInput = true;
+				UIKeyboardInitData kbData;
+				kbData.title       = app.GetString(IDS_CREATE_NEW_WORLD_SEED);
+				kbData.defaultText = m_editSeed.getLabel();
+				kbData.maxChars    = 60;
+				kbData.callback    = &UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback;
+				kbData.lpParam     = this;
+				ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
+			}
+#else
 			m_bIgnoreInput=true;
 #ifdef __PS3__
 			int language = XGetLanguage();
@@ -583,13 +627,13 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
 				InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD_SEED),m_editSeed.getLabel(),(DWORD)0,60,&UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback,this,C_4JInput::EKeyboardMode_Default);
 				break;
 			default:
-				// 4J Stu - Use a different keyboard for non-asian languages so we don't have prediction on
 				InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD_SEED),m_editSeed.getLabel(),(DWORD)0,60,&UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback,this,C_4JInput::EKeyboardMode_Alphabet_Extended);
 				break;
 			}
 #else
 			InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD_SEED),m_editSeed.getLabel(),(DWORD)0,60,&UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback,this,C_4JInput::EKeyboardMode_Default);
 #endif
+#endif
 		}
 		break;
 	}
@@ -598,8 +642,8 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_LaunchMoreOptionsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_WorldSize:
 #ifdef _LARGE_WORLDS
@@ -610,11 +654,11 @@ void UIScene_LaunchMoreOptionsMenu::handleSliderMove(F64 sliderId, F64 currentVa
 		break;
 	case eControl_WorldResize:
 #ifdef _LARGE_WORLDS
-		EGameHostOptionWorldSize changedSize = EGameHostOptionWorldSize(value+1);
+		EGameHostOptionWorldSize changedSize = static_cast<EGameHostOptionWorldSize>(value + 1);
 		if(changedSize >= m_params->currentWorldSize)
 		{
 			m_sliderWorldResize.handleSliderMove(value);
-			m_params->newWorldSize = EGameHostOptionWorldSize(value+1);
+			m_params->newWorldSize = static_cast<EGameHostOptionWorldSize>(value + 1);
 			m_sliderWorldResize.setLabel(app.GetString(m_iWorldSizeTitleA[value]));
 		}
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h
index 367db10d..caf9a71f 100644
--- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h
@@ -140,6 +140,10 @@ protected:
 public:
 	virtual void tick();
 	virtual void handleDestroy();
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+#endif
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
 	virtual void handleFocusChange(F64 controlId, F64 childId);
@@ -160,6 +164,8 @@ private:
 
 #ifdef __PSVITA__
 	virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased);
-	virtual UIControl* GetMainPanel();
 #endif //__PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
+	virtual UIControl* GetMainPanel();
+#endif
 };
diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
index 12b21905..ed0b3151 100644
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
@@ -9,12 +9,12 @@
 #define PLAYER_ONLINE_TIMER_TIME 100
 
 // if the value is greater than 32000, it's an xzp icon that needs displayed, rather than the game icon
-const int UIScene_LeaderboardsMenu::TitleIcons[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][7] = 
+const int UIScene_LeaderboardsMenu::TitleIcons[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][7] =
 {
-	{ UIControl_LeaderboardList::e_ICON_TYPE_WALKED,		UIControl_LeaderboardList::e_ICON_TYPE_FALLEN,		Item::minecart_Id,		Item::boat_Id,					NULL },
-	{ Tile::dirt_Id,		Tile::cobblestone_Id,	Tile::sand_Id,			Tile::stone_Id,			Tile::gravel_Id,		Tile::clay_Id,			Tile::obsidian_Id },
-	{ Item::egg_Id,			Item::wheat_Id,			Tile::mushroom_brown_Id,		Tile::reeds_Id,			Item::bucket_milk_Id,	Tile::pumpkin_Id,		NULL },
-	{ UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIE,		UIControl_LeaderboardList::e_ICON_TYPE_SKELETON,		UIControl_LeaderboardList::e_ICON_TYPE_CREEPER,		UIControl_LeaderboardList::e_ICON_TYPE_SPIDER,		UIControl_LeaderboardList::e_ICON_TYPE_SPIDERJOKEY,	UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIEPIGMAN,	UIControl_LeaderboardList::e_ICON_TYPE_SLIME },
+    {UIControl_LeaderboardList::e_ICON_TYPE_WALKED, UIControl_LeaderboardList::e_ICON_TYPE_FALLEN, Item::minecart_Id, Item::boat_Id, -1},
+    {Tile::dirt_Id, Tile::cobblestone_Id, Tile::sand_Id, Tile::stone_Id, Tile::gravel_Id, Tile::clay_Id, Tile::obsidian_Id},
+    {Item::egg_Id, Item::wheat_Id, Tile::mushroom_brown_Id, Tile::reeds_Id, Item::bucket_milk_Id, Tile::pumpkin_Id, -1},
+    {UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIE, UIControl_LeaderboardList::e_ICON_TYPE_SKELETON, UIControl_LeaderboardList::e_ICON_TYPE_CREEPER, UIControl_LeaderboardList::e_ICON_TYPE_SPIDER, UIControl_LeaderboardList::e_ICON_TYPE_SPIDERJOKEY, UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIEPIGMAN, UIControl_LeaderboardList::e_ICON_TYPE_SLIME},
 };
 const UIScene_LeaderboardsMenu::LeaderboardDescriptor UIScene_LeaderboardsMenu::LEADERBOARD_DESCRIPTORS[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][4] = {
 	{
@@ -438,7 +438,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 	}
 	else
 	{
-		m_newEntryIndex = (unsigned int)startIndex;
+		m_newEntryIndex = static_cast<unsigned int>(startIndex);
 		// m_newReadSize	= min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1));
 	}
 
@@ -462,7 +462,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 		{
 			m_interface.ReadStats_TopRank(
 				this, 
-				m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard, 
+				m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard), 
 				m_newEntryIndex, m_newReadSize
 				);
 		}
@@ -472,7 +472,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 			PlayerUID uid;
 			ProfileManager.GetXUID(ProfileManager.GetPrimaryPad(),&uid, true);
 			m_interface.ReadStats_MyScore(	this,
-				m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard,
+				m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard),
 				uid /*ignored on PS3*/,
 				m_newReadSize
 				);
@@ -483,7 +483,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 			PlayerUID uid;
 			ProfileManager.GetXUID(ProfileManager.GetPrimaryPad(),&uid, true);
 			m_interface.ReadStats_Friends(	this,
-				m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard,
+				m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard),
 				uid /*ignored on PS3*/,
 				m_newEntryIndex, m_newReadSize
 				);
@@ -558,7 +558,7 @@ bool UIScene_LeaderboardsMenu::RetrieveStats()
 				else
 				{
 					m_leaderboard.m_entries[entryIndex].m_columns[i] = UINT_MAX;
-					swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], 12, L"%.1fkm", ((float)m_leaderboard.m_entries[entryIndex].m_columns[i])/100.f/1000.f);
+					swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], 12, L"%.1fkm", static_cast<float>(m_leaderboard.m_entries[entryIndex].m_columns[i])/100.f/1000.f);
 				}
 			}
 
@@ -576,7 +576,7 @@ bool UIScene_LeaderboardsMenu::RetrieveStats()
 		return true;
 	}
 
-	//assert( LeaderboardManager::Instance()->GetStats() != NULL );
+	//assert( LeaderboardManager::Instance()->GetStats() != nullptr );
 	//PXUSER_STATS_READ_RESULTS stats = LeaderboardManager::Instance()->GetStats();
 	//if( m_currentFilter == LeaderboardManager::eFM_Friends  )	LeaderboardManager::Instance()->SortFriendStats();
 
@@ -781,7 +781,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry(LeaderboardManager::ReadScor
 			else if(iDigitC<8)
 			{
 				// km with a .X
-				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #ifdef _DEBUG
 				//app.DebugPrintf("Display - %.1fkm\n", ((float)leaderboardEntry->m_columns[i])/1000.f);
 #endif
@@ -789,7 +789,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry(LeaderboardManager::ReadScor
 			else
 			{
 				// bigger than that, so no decimal point
-				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #ifdef _DEBUG
 				//app.DebugPrintf("Display - %.0fkm\n", ((float)leaderboardEntry->m_columns[i])/1000.f);
 #endif
@@ -964,14 +964,14 @@ int UIScene_LeaderboardsMenu::SetLeaderboardTitleIcons()
 void UIScene_LeaderboardsMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	int slotId = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 	if (slotId == -1)
 	{
 		//app.DebugPrintf("This is not the control we are looking for\n");
 	}
 	else
 	{
-		shared_ptr<ItemInstance> item = shared_ptr<ItemInstance>( new ItemInstance(TitleIcons[m_currentLeaderboard][slotId], 1, 0) );
+		shared_ptr<ItemInstance> item = std::make_shared<ItemInstance>(TitleIcons[m_currentLeaderboard][slotId], 1, 0);
 		customDrawSlotControl(region,m_iPad,item,1.0f,false,false);
 	}
 }
@@ -979,14 +979,14 @@ void UIScene_LeaderboardsMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 void UIScene_LeaderboardsMenu::handleSelectionChanged(F64 selectedId)
 {
 	ui.PlayUISFX(eSFX_Focus);
-	m_newSel = (int)selectedId;
+	m_newSel = static_cast<int>(selectedId);
 	updateTooltips();
 }
 
 // Handle a request from Iggy for more data
 void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up)
 {
-	unsigned int item = (int)startIndex;
+	unsigned int item = static_cast<int>(startIndex);
 
 	if( m_leaderboard.m_totalEntryCount > 0 && (item+1) < GetEntryStartIndex() )
 	{
@@ -995,7 +995,7 @@ void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up)
 			int readIndex = (GetEntryStartIndex() + 1) - READ_SIZE;
 			if( readIndex <= 0 )
 				readIndex = 1;
-			assert( readIndex >= 1 && readIndex <= (int)m_leaderboard.m_totalEntryCount );
+            assert( readIndex >= 1 && readIndex <= static_cast<int>(m_leaderboard.m_totalEntryCount));
 			ReadStats(readIndex);
 		}
 	}
@@ -1004,7 +1004,7 @@ void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up)
 		if( LeaderboardManager::Instance()->isIdle() )
 		{
 			int readIndex = (GetEntryStartIndex() + 1) + m_leaderboard.m_entries.size();
-			assert( readIndex >= 1 && readIndex <= (int)m_leaderboard.m_totalEntryCount );
+            assert( readIndex >= 1 && readIndex <= static_cast<int>(m_leaderboard.m_totalEntryCount));
 			ReadStats(readIndex);
 		}
 	}
@@ -1033,7 +1033,7 @@ void UIScene_LeaderboardsMenu::handleTimerComplete(int id)
 
 int UIScene_LeaderboardsMenu::ExitLeaderboards(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LeaderboardsMenu* pClass = (UIScene_LeaderboardsMenu*)pParam;
+	UIScene_LeaderboardsMenu* pClass = static_cast<UIScene_LeaderboardsMenu *>(pParam);
 
 	pClass->navigateBack();
 
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
index ed3c8137..d61a7902 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
@@ -34,7 +34,7 @@ int UIScene_LoadMenu::m_iDifficultyTitleSettingA[4]=
 
 int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	UIScene_LoadMenu *pClass= (UIScene_LoadMenu *)ui.GetSceneFromCallbackId((size_t)lpParam);
+	UIScene_LoadMenu *pClass= static_cast<UIScene_LoadMenu *>(ui.GetSceneFromCallbackId((size_t)lpParam));
 
 	if(pClass)
 	{
@@ -50,7 +50,7 @@ int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumb
 		}
 		else
 		{
-			app.DebugPrintf("Thumbnail data is NULL, or has size 0\n");
+			app.DebugPrintf("Thumbnail data is nullptr, or has size 0\n");
 			pClass->m_bThumbnailGetFailed = true;
 		}
 		pClass->m_bRetrievingSaveThumbnail = false;
@@ -64,7 +64,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	LoadMenuInitData *params = (LoadMenuInitData *)initData;
+	LoadMenuInitData *params = static_cast<LoadMenuInitData *>(initData);
 
 	m_labelGameName.init(app.GetString(IDS_WORLD_NAME));
 	m_labelSeed.init(L"");
@@ -102,7 +102,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bSaveThumbnailReady = false;
 	m_bRetrievingSaveThumbnail = true;
 	m_bShowTimer = false;
-	m_pDLCPack = NULL;
+	m_pDLCPack = nullptr;
 	m_bAvailableTexturePacksChecked=false;
 	m_bRequestQuadrantSignin = false;
 	m_iTexturePacksNotInstalled=0;
@@ -249,7 +249,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 #endif
 #endif
 #ifdef _WINDOWS64
-		if (params->saveDetails != NULL && params->saveDetails->UTF8SaveName[0] != '\0')
+		if (params->saveDetails != nullptr && params->saveDetails->UTF8SaveName[0] != '\0')
 		{
 			wchar_t wSaveName[128];
 			ZeroMemory(wSaveName, sizeof(wSaveName));
@@ -305,7 +305,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 		if(!m_bAvailableTexturePacksChecked)
 #endif
 		{		
-			DLC_INFO *pDLCInfo=NULL;
+			DLC_INFO *pDLCInfo=nullptr;
 
 			// first pass - look to see if there are any that are not in the list
 			bool bTexturePackAlreadyListed;
@@ -451,9 +451,9 @@ void UIScene_LoadMenu::tick()
 
 		// #ifdef _DEBUG
 		// 			// dump out the thumbnail
-		// 			HANDLE hThumbnail = CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
+		// 			HANDLE hThumbnail = CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, nullptr);
 		// 			DWORD dwBytes;
-		// 			WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,NULL);
+		// 			WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,nullptr);
 		// 			XCloseHandle(hThumbnail);
 		// #endif
 
@@ -477,7 +477,7 @@ void UIScene_LoadMenu::tick()
 			m_MoreOptionsParams.bTNT = app.GetGameHostOption(uiHostOptions,eGameHostOption_TNT)>0?TRUE:FALSE;
 			m_MoreOptionsParams.bHostPrivileges = app.GetGameHostOption(uiHostOptions,eGameHostOption_CheatsEnabled)>0?TRUE:FALSE;
 			m_MoreOptionsParams.bDisableSaving = app.GetGameHostOption(uiHostOptions,eGameHostOption_DisableSaving)>0?TRUE:FALSE;
-			m_MoreOptionsParams.currentWorldSize = (EGameHostOptionWorldSize)app.GetGameHostOption(uiHostOptions,eGameHostOption_WorldSize);
+			m_MoreOptionsParams.currentWorldSize = static_cast<EGameHostOptionWorldSize>(app.GetGameHostOption(uiHostOptions, eGameHostOption_WorldSize));
 			m_MoreOptionsParams.newWorldSize = m_MoreOptionsParams.currentWorldSize;
 
 			m_MoreOptionsParams.bMobGriefing = app.GetGameHostOption(uiHostOptions, eGameHostOption_MobGriefing);
@@ -696,7 +696,7 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId)
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GameMode:
 		switch(m_iGameModeId)
@@ -725,7 +725,7 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId)
 		break;
 	case eControl_TexturePackList:
 		{
-			UpdateCurrentTexturePack((int)childId);
+			UpdateCurrentTexturePack(static_cast<int>(childId));
 		}
 		break;
 	case eControl_LoadWorld:
@@ -771,7 +771,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 		// texture pack hasn't been set yet, so check what it will be
 		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 
-		if(pTexturePack==NULL)
+		if(pTexturePack==nullptr)
 		{
 #if TO_BE_IMPLEMENTED
 			// They've selected a texture pack they don't have yet
@@ -821,7 +821,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 	{
 		// texture pack hasn't been set yet, so check what it will be
 		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
-		DLCTexturePack *pDLCTexPack=(DLCTexturePack *)pTexturePack;
+		DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(pTexturePack);
 		m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();
 
 		// do we have a license?
@@ -849,7 +849,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 				DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_pDLCPack->getPurchaseOfferId());
 				ULONGLONG ullOfferID_Full;
 
-				if(pDLCInfo!=NULL)
+				if(pDLCInfo!=nullptr)
 				{
 					ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 				}
@@ -946,8 +946,8 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Difficulty:
 		m_sliderDifficulty.handleSliderMove(value);
@@ -1107,7 +1107,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 					// inform them that leaderboard writes and achievements will be disabled
 					//ui.RequestMessageBox(IDS_TITLE_START_GAME, IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE, uiIDA, 1, m_iPad,&CScene_LoadGameSettings::ConfirmLoadReturned,this,app.GetStringTable());
 
-					if(m_levelGen != NULL)
+					if(m_levelGen != nullptr)
 					{
 						m_bIsCorrupt = false;
 						LoadDataComplete(this);
@@ -1150,7 +1150,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 	}
 	else
 	{
-		if(m_levelGen != NULL)
+		if(m_levelGen != nullptr)
 		{
 			m_bIsCorrupt = false;
 			LoadDataComplete(this);
@@ -1182,7 +1182,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 
 int UIScene_LoadMenu::CheckResetNetherReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -1206,11 +1206,11 @@ int UIScene_LoadMenu::CheckResetNetherReturned(void *pParam,int iPad,C4JStorage:
 
 int UIScene_LoadMenu::ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
-		if(pClass->m_levelGen != NULL)
+		if(pClass->m_levelGen != nullptr)
 		{
 			pClass->m_bIsCorrupt = false;
 			pClass->LoadDataComplete(pClass);
@@ -1246,7 +1246,7 @@ int UIScene_LoadMenu::ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMes
 
 int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	if(!pClass->m_bIsCorrupt)
 	{
@@ -1312,7 +1312,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 #if defined(__PS3__) || defined(__PSVITA__)
 		if(isOnlineGame)
 		{
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,nullptr,&bContentRestricted,nullptr);
 		}
 #endif
 
@@ -1362,7 +1362,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return 0;
 				}
 
@@ -1381,7 +1381,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),nullptr,0,false);
 			}
 
 #endif		
@@ -1392,7 +1392,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 				if(isOnlineGame)
 				{
 					bool chatRestricted = false;
-					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 					if(chatRestricted)
 					{
 						ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1431,7 +1431,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return 0;
 				}
 
@@ -1450,7 +1450,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),nullptr,0,false);
 			}
 #endif
 			else
@@ -1484,7 +1484,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 
 int UIScene_LoadMenu::LoadSaveDataReturned(void *pParam,bool bIsCorrupt, bool bIsOwner)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	pClass->m_bIsCorrupt=bIsCorrupt;
 
@@ -1520,13 +1520,13 @@ int UIScene_LoadMenu::LoadSaveDataReturned(void *pParam,bool bIsCorrupt, bool bI
 
 int UIScene_LoadMenu::TrophyDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 	return LoadDataComplete(pClass);
 }
 
 int UIScene_LoadMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -1543,7 +1543,7 @@ int UIScene_LoadMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage:
 
 int UIScene_LoadMenu::DeleteSaveDataReturned(void *pParam,bool bSuccess)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	app.SetCorruptSaveDeleted(true);
 	pClass->navigateBack();
@@ -1554,7 +1554,7 @@ int UIScene_LoadMenu::DeleteSaveDataReturned(void *pParam,bool bSuccess)
 // 4J Stu - Shared functionality that is the same whether we needed a quadrant sign-in or not
 void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocalUsersMask)
 {
-	if(pClass->m_levelGen == NULL)
+	if(pClass->m_levelGen == nullptr)
 	{
 		INT saveOrCheckpointId = 0;
 		bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
@@ -1582,7 +1582,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = pClass->m_seed;
-	param->saveData = NULL;	
+	param->saveData = nullptr;	
 	param->levelGen = pClass->m_levelGen;
 	param->texturePackId = pClass->m_MoreOptionsParams.dwTexturePack;
 	param->levelName = pClass->m_levelName;
@@ -1642,7 +1642,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave time
 	app.SetAutosaveTimerTime();
@@ -1676,7 +1676,7 @@ void UIScene_LoadMenu::checkStateAndStartGame()
 
 int UIScene_LoadMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -1779,7 +1779,7 @@ int UIScene_LoadMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int
 						if(ProfileManager.IsSignedInLive(i))
 						{
 							bool chatRestricted = false;
-							ProfileManager.GetChatAndContentRestrictions(i,false,&chatRestricted,NULL,NULL);
+							ProfileManager.GetChatAndContentRestrictions(i,false,&chatRestricted,nullptr,nullptr);
 							if(chatRestricted)
 							{
 								ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, i );
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadMenu.h
index 085cb67f..53d66d55 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.h
@@ -16,7 +16,7 @@ private:
 	};
 
 	static int m_iDifficultyTitleSettingA[4];
-	
+
 	UIControl m_controlMainPanel;
 	UIControl_Label m_labelGameName, m_labelSeed, m_labelCreatedMode;
 	UIControl_Button m_buttonGamemode, m_buttonMoreOptions, m_buttonLoadWorld;
@@ -43,7 +43,7 @@ private:
 
 	LevelGenerationOptions *m_levelGen;
 	DLCPack * m_pDLCPack;
-	
+
 	int m_iSaveGameInfoIndex;
 	int m_CurrentDifficulty;
 	bool m_bGameModeCreative;
@@ -58,7 +58,7 @@ private:
 	bool m_bRequestQuadrantSignin;
 	bool m_bIsCorrupt;
 	bool m_bThumbnailGetFailed;
-	__int64 m_seed;
+	int64_t m_seed;
 	wstring m_levelName;
 
 #ifdef __PS3__
@@ -73,7 +73,7 @@ private:
 	bool m_bRebuildTouchBoxes;
 public:
 	UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLayer);
-	
+
 	virtual void updateTooltips();
 	virtual void updateComponents();
 
@@ -107,7 +107,7 @@ private:
 #ifdef _DURANGO
 	static void checkPrivilegeCallback(LPVOID lpParam, bool hasPrivilege, int iPad);
 #endif
-	
+
 	static int ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static void StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocalUsersMask);
 	static int LoadSaveDataReturned(void *pParam,bool bIsCorrupt, bool bIsOwner);
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 8664aca1..d73148f5 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -36,13 +36,13 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
     if (slashPos != wstring::npos)
     {
         wstring sidecarPath = filePath.substr(0, slashPos + 1) + L"worldname.txt";
-        FILE *fr = NULL;
+        FILE *fr = nullptr;
         if (_wfopen_s(&fr, sidecarPath.c_str(), L"r") == 0 && fr)
         {
             char buf[128] = {};
             if (fgets(buf, sizeof(buf), fr))
             {
-                int len = (int)strlen(buf);
+                int len = static_cast<int>(strlen(buf));
                 while (len > 0 && (buf[len-1] == '\n' || buf[len-1] == '\r' || buf[len-1] == ' '))
                     buf[--len] = '\0';
                 fclose(fr);
@@ -57,15 +57,15 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
         }
     }
 
-    HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+    HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
     if (hFile == INVALID_HANDLE_VALUE) return L"";
 
-    DWORD fileSize = GetFileSize(hFile, NULL);
+    DWORD fileSize = GetFileSize(hFile, nullptr);
     if (fileSize < 12 || fileSize == INVALID_FILE_SIZE) { CloseHandle(hFile); return L""; }
 
     unsigned char *rawData = new unsigned char[fileSize];
     DWORD bytesRead = 0;
-    if (!ReadFile(hFile, rawData, fileSize, &bytesRead, NULL) || bytesRead != fileSize)
+    if (!ReadFile(hFile, rawData, fileSize, &bytesRead, nullptr) || bytesRead != fileSize)
     {
         CloseHandle(hFile);
         delete[] rawData;
@@ -73,7 +73,7 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
     }
     CloseHandle(hFile);
 
-    unsigned char *saveData = NULL;
+    unsigned char *saveData = nullptr;
     unsigned int saveSize   = 0;
     bool freeSaveData = false;
 
@@ -120,10 +120,10 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
                         ba.data   = (byte*)(saveData + off);
                         ba.length = len;
                         CompoundTag *root = NbtIo::decompress(ba);
-                        if (root != NULL)
+                        if (root != nullptr)
                         {
                             CompoundTag *dataTag = root->getCompound(L"Data");
-                            if (dataTag != NULL)
+                            if (dataTag != nullptr)
                                 result = dataTag->getString(L"LevelName");
                             delete root;
                         }
@@ -172,7 +172,7 @@ C4JStorage::SAVETRANSFER_FILE_DETAILS UIScene_LoadOrJoinMenu::m_debugTransferDet
 
 int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-    UIScene_LoadOrJoinMenu *pClass= (UIScene_LoadOrJoinMenu *)lpParam;
+    UIScene_LoadOrJoinMenu *pClass= static_cast<UIScene_LoadOrJoinMenu *>(lpParam);
 
     app.DebugPrintf("Received data for save thumbnail\n");
 
@@ -184,9 +184,9 @@ int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE p
     }
     else
     {
-        pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = NULL;
+        pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = nullptr;
         pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].dwThumbnailSize = 0;
-        app.DebugPrintf("Save thumbnail data is NULL, or has size 0\n");
+        app.DebugPrintf("Save thumbnail data is nullptr, or has size 0\n");
     }
     pClass->m_bSaveThumbnailReady = true;
 
@@ -215,7 +215,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
     m_bIgnoreInput = false;
     m_bShowingPartyGamesOnly = false;
     m_bInParty = false;
-    m_currentSessions = NULL;
+    m_currentSessions = nullptr;
     m_iState=e_SavesIdle;
     //m_bRetrievingSaveInfo=false;
 
@@ -239,9 +239,9 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
     m_bRetrievingSaveThumbnails = false;
     m_bSaveThumbnailReady = false;
     m_bExitScene=false;
-    m_pSaveDetails=NULL;
+    m_pSaveDetails=nullptr;
     m_bSavesDisplayed=false;
-    m_saveDetails = NULL;
+    m_saveDetails = nullptr;
     m_iSaveDetailsCount = 0;
     m_iTexturePacksNotInstalled = 0;
 	m_bCopying = false;
@@ -320,7 +320,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
 #ifdef _XBOX
     // 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 
-    DLC_INFO *pDLCInfo=NULL;
+    DLC_INFO *pDLCInfo=nullptr;
 
     // first pass - look to see if there are any that are not in the list
     bool bTexturePackAlreadyListed;
@@ -399,11 +399,16 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
 
 UIScene_LoadOrJoinMenu::~UIScene_LoadOrJoinMenu()
 {
-    g_NetworkManager.SetSessionsUpdatedCallback( NULL, NULL );
+    g_NetworkManager.SetSessionsUpdatedCallback( nullptr, nullptr );
     app.SetLiveLinkRequired( false );
 
-    delete m_currentSessions;
-    m_currentSessions = NULL;
+    if (m_currentSessions)
+    {
+        for (const auto& it : *m_currentSessions)
+            delete it;
+        delete m_currentSessions;
+        m_currentSessions = nullptr;
+    }
 
 #if TO_BE_IMPLEMENTED
     // Reset the background downloading, in case we changed it by attempting to download a texture pack
@@ -520,6 +525,9 @@ void UIScene_LoadOrJoinMenu::Initialise()
 {
     m_iSaveListIndex = 0;
 	m_iGameListIndex = 0;
+#ifdef _WINDOWS64
+	m_addServerPhase = eAddServer_Idle;
+#endif
 
     m_iDefaultButtonsC = 0;
 	m_iMashUpButtonsC=0;
@@ -705,7 +713,7 @@ void UIScene_LoadOrJoinMenu::tick()
         if(!m_bSavesDisplayed)
         {
             m_pSaveDetails=StorageManager.ReturnSavesInfo();
-            if(m_pSaveDetails!=NULL)
+            if(m_pSaveDetails!=nullptr)
             {
                 //CD - Fix - Adding define for ORBIS/XBOXONE
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
@@ -716,11 +724,11 @@ void UIScene_LoadOrJoinMenu::tick()
                 m_bSavesDisplayed=true;
                 UpdateGamesList();
 
-                if(m_saveDetails!=NULL)
+                if(m_saveDetails!=nullptr)
                 {
                     for(unsigned int i = 0; i < m_iSaveDetailsCount; ++i)
                     {
-                        if(m_saveDetails[i].pbThumbnailData!=NULL)
+                        if(m_saveDetails[i].pbThumbnailData!=nullptr)
                         {
                             delete m_saveDetails[i].pbThumbnailData;
                         }
@@ -1000,9 +1008,9 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
 #ifdef __ORBIS__
 		// We need to make sure this is non-null so that we have an idea of free space
         m_pSaveDetails=StorageManager.ReturnSavesInfo();
-        if(m_pSaveDetails==NULL)
+        if(m_pSaveDetails==nullptr)
         {
-            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
+            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,nullptr,this,"save");
         }
 #endif
 
@@ -1015,7 +1023,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         if( savesDir.exists() )
         {
             m_saves = savesDir.listFiles();
-            uiSaveC = (unsigned int)m_saves->size();
+            uiSaveC = static_cast<unsigned int>(m_saves->size());
         }
         // add the New Game and Tutorial after the saves list is retrieved, if there are any saves
 
@@ -1049,9 +1057,9 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         m_controlSavesTimer.setVisible(true);
 
         m_pSaveDetails=StorageManager.ReturnSavesInfo();
-        if(m_pSaveDetails==NULL)
+        if(m_pSaveDetails==nullptr)
         {
-            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
+            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad, nullptr,this,"save");
         }
 
 #if TO_BE_IMPLEMENTED
@@ -1169,6 +1177,43 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
 			}
 		}
 #endif
+#ifdef _WINDOWS64
+		// Right click on a save opens save options (same as RB / ACTION_MENU_RIGHT_SCROLL)
+		if(pressed && !repeat && ProfileManager.IsFullVersion() && !StorageManager.GetSaveDisabled())
+		{
+			if(DoesSavesListHaveFocus() && (m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC))
+			{
+				m_bIgnoreInput = true;
+				if(StorageManager.EnoughSpaceForAMinSaveGame())
+				{
+					UINT uiIDA[3];
+					uiIDA[0]=IDS_CONFIRM_CANCEL;
+					uiIDA[1]=IDS_TITLE_RENAMESAVE;
+					uiIDA[2]=IDS_TOOLTIPS_DELETESAVE;
+					ui.RequestAlertMessage(IDS_TOOLTIPS_SAVEOPTIONS, IDS_TEXT_SAVEOPTIONS, uiIDA, 3, iPad,&UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned,this);
+				}
+				else
+				{
+					UINT uiIDA[2];
+					uiIDA[0]=IDS_CONFIRM_CANCEL;
+					uiIDA[1]=IDS_CONFIRM_OK;
+					ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,this);
+				}
+				ui.PlayUISFX(eSFX_Press);
+			}
+			else if(DoesMashUpWorldHaveFocus() && (m_iSaveListIndex != JOIN_LOAD_CREATE_BUTTON_INDEX))
+			{
+				LevelGenerationOptions *levelGen = m_generators.at(m_iSaveListIndex - 1);
+				if(!levelGen->isTutorial() && levelGen->requiresTexturePack())
+				{
+					m_bIgnoreInput = true;
+					app.HideMashupPackWorld(m_iPad, levelGen->getRequiredTexturePackId());
+					m_iState = e_SavesRepopulateAfterMashupHide;
+				}
+				ui.PlayUISFX(eSFX_Press);
+			}
+		}
+#endif
         break;
     case ACTION_MENU_Y:
 #if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__)
@@ -1353,7 +1398,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
 int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes)
 {
     // 4J HEG - No reason to set value if keyboard was cancelled
-    UIScene_LoadOrJoinMenu *pClass=(UIScene_LoadOrJoinMenu *)lpParam;
+    UIScene_LoadOrJoinMenu *pClass=static_cast<UIScene_LoadOrJoinMenu *>(lpParam);
 	pClass->m_bIgnoreInput=false;
     if (bRes)
     {
@@ -1378,7 +1423,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                 // Convert the ui16Text input to a wide string
                 wchar_t wNewName[128] = {};
                 for (int k = 0; k < 127 && ui16Text[k]; k++)
-                    wNewName[k] = (wchar_t)ui16Text[k];
+                    wNewName[k] = static_cast<wchar_t>(ui16Text[k]);
 
                 // Convert to narrow for storage and in-memory update
                 char narrowName[128] = {};
@@ -1389,7 +1434,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                 mbstowcs(wFilename, pClass->m_saveDetails[listPos].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
                 wstring sidecarPath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\worldname.txt");
 
-                FILE *fw = NULL;
+                FILE *fw = nullptr;
                 if (_wfopen_s(&fw, sidecarPath.c_str(), L"w") == 0 && fw)
                 {
                     fputs(narrowName, fw);
@@ -1422,18 +1467,22 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
 }
 void UIScene_LoadOrJoinMenu::handleInitFocus(F64 controlId, F64 childId)
 {
-    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId);
+    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 }
 
 void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId);
+    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamesList:
 		m_iGameListIndex = childId;
-		m_buttonListGames.updateChildFocus( (int) childId );
+#ifdef _WINDOWS64
+		// Offset past the "Add Server" button so m_iGameListIndex is a session index
+		m_iGameListIndex -= 1;
+#endif
+		m_buttonListGames.updateChildFocus( static_cast<int>(childId) );
 		break;
 	case eControl_SavesList:
 		m_iSaveListIndex = childId;
@@ -1455,18 +1504,18 @@ void UIScene_LoadOrJoinMenu::remoteStorageGetSaveCallback(LPVOID lpParam, SonyRe
 
 void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
 {
-    switch((int)controlId)
+    switch(static_cast<int>(controlId))
     {
     case eControl_SavesList:
         {
             m_bIgnoreInput=true;
 
-            int lGenID = (int)childId - 1;
+            int lGenID = static_cast<int>(childId) - 1;
 
             //CD - Added for audio
             ui.PlayUISFX(eSFX_Press);
 
-            if((int)childId == JOIN_LOAD_CREATE_BUTTON_INDEX)
+            if(static_cast<int>(childId) == JOIN_LOAD_CREATE_BUTTON_INDEX)
             {
                 app.SetTutorialMode( false );
 
@@ -1497,7 +1546,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
                     params->iSaveGameInfoIndex=-1;
                     //params->pbSaveRenamed=&m_bSaveRenamed;
                     params->levelGen = levelGen;
-                    params->saveDetails = NULL;
+                    params->saveDetails = nullptr;
 
                     // navigate to the settings scene
                     ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_LoadMenu, params);
@@ -1508,7 +1557,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
 #ifdef __ORBIS__
                 // check if this is a damaged save
 				PSAVE_INFO pSaveInfo = &m_pSaveDetails->SaveInfoA[((int)childId)-m_iDefaultButtonsC];
-                if(pSaveInfo->thumbnailData == NULL && pSaveInfo->modifiedTime == 0)		// no thumbnail data and time of zero and zero blocks useset for corrupt files
+                if(pSaveInfo->thumbnailData == nullptr && pSaveInfo->modifiedTime == 0)		// no thumbnail data and time of zero and zero blocks useset for corrupt files
                 {
                     // give the option to delete the save
                     UINT uiIDA[2];
@@ -1524,17 +1573,17 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
 
                     if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
                     {
-                        LoadSaveFromDisk(m_saves->at((int)childId-m_iDefaultButtonsC));
+                        LoadSaveFromDisk(m_saves->at(static_cast<int>(childId)-m_iDefaultButtonsC));
                     }
                     else
                     {
                         LoadMenuInitData *params = new LoadMenuInitData();
                         params->iPad = m_iPad;
                         // need to get the iIndex from the list item, since the position in the list doesn't correspond to the GetSaveGameInfo list because of sorting
-                        params->iSaveGameInfoIndex=m_saveDetails[((int)childId)-m_iDefaultButtonsC].saveId;
+                        params->iSaveGameInfoIndex=m_saveDetails[static_cast<int>(childId)-m_iDefaultButtonsC].saveId;
                         //params->pbSaveRenamed=&m_bSaveRenamed;
-                        params->levelGen = NULL;
-                        params->saveDetails = &m_saveDetails[ ((int)childId)-m_iDefaultButtonsC ];
+                        params->levelGen = nullptr;
+                        params->saveDetails = &m_saveDetails[ static_cast<int>(childId)-m_iDefaultButtonsC ];
 
 #ifdef _XBOX_ONE
                         // On XB1, saves might need syncing, in which case inform the user so they can decide whether they want to wait for this to happen
@@ -1560,6 +1609,14 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
         break;
     case eControl_GamesList:
         {
+#ifdef _WINDOWS64
+            if (static_cast<int>(childId) == ADD_SERVER_BUTTON_INDEX)
+            {
+                ui.PlayUISFX(eSFX_Press);
+                BeginAddServer();
+                break;
+            }
+#endif
             m_bIgnoreInput=true;
 
 			m_eAction = eAction_JoinGame;
@@ -1568,7 +1625,11 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
             ui.PlayUISFX(eSFX_Press);
 
 			{
-				int nIndex = (int)childId;
+				int nIndex = static_cast<int>(childId);
+#ifdef _WINDOWS64
+				// Offset by 1 because the "Add Server" button is at index 0
+				nIndex -= 1;
+#endif
 				m_iGameListIndex = nIndex;
 				CheckAndJoinGame(nIndex);
 			}
@@ -1588,7 +1649,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 		bool bContentRestricted=false;
 
 		// we're online, since we are joining a game
-		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&noUGC,&bContentRestricted,NULL);
+		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&noUGC,&bContentRestricted,nullptr);
 
 #ifdef __ORBIS__
 		// 4J Stu - On PS4 we don't restrict playing multiplayer based on chat restriction, so remove this check
@@ -1632,7 +1693,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
 			// Not allowed to play online
-			ui.RequestAlertMessage(IDS_ONLINE_GAME, IDS_CHAT_RESTRICTION_UGC, uiIDA, 1, m_iPad,NULL,this);
+			ui.RequestAlertMessage(IDS_ONLINE_GAME, IDS_CHAT_RESTRICTION_UGC, uiIDA, 1, m_iPad,nullptr,this);
 #else
 			// Not allowed to play online
 			ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, 0 );
@@ -1677,7 +1738,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 				// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_OK;
-				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 				return;
 			}
 
@@ -1697,7 +1758,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 			//                     UINT uiIDA[2];
 			//                     uiIDA[0]=IDS_CONFIRM_OK;
 			//                     uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-			//                     ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+			//                     ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 
 			m_bIgnoreInput=false;
 			return;
@@ -1706,12 +1767,34 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 #endif
 #endif
 
-		//CScene_MultiGameInfo::JoinMenuInitData *initData = new CScene_MultiGameInfo::JoinMenuInitData();
 		m_initData->iPad = 0;;
 		m_initData->selectedSession = m_currentSessions->at( gameIndex );
+#ifdef _WINDOWS64
+		{
+
+			int serverDbCount = 0;
+			FILE* dbFile = fopen("servers.db", "rb");
+			if (dbFile)
+			{
+				char magic[4] = {};
+				if (fread(magic, 1, 4, dbFile) == 4 && memcmp(magic, "MCSV", 4) == 0)
+				{
+					uint32_t version = 0, count = 0;
+					fread(&version, sizeof(uint32_t), 1, dbFile);
+					fread(&count, sizeof(uint32_t), 1, dbFile);
+					if (version == 1)
+						serverDbCount = static_cast<int>(count);
+				}
+				fclose(dbFile);
+			}
+			int lanCount = static_cast<int>(m_currentSessions->size()) - serverDbCount;
+			if (gameIndex >= lanCount && lanCount >= 0)
+				m_initData->serverIndex = gameIndex - lanCount;
+			else
+				m_initData->serverIndex = -1; 
+		}
+#endif
 
-		// check that we have the texture pack available
-		// If it's not the default texture pack
 		if(m_initData->selectedSession->data.texturePackParentId!=0)
 		{
 			int texturePacksCount = Minecraft::GetInstance()->skins->getTexturePackCount();
@@ -1729,8 +1812,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 
 			if(bHasTexturePackInstalled==false)
 			{
-				// upsell the texture pack
-				// tell sentient about the upsell of the full version of the skin pack
+
 #ifdef _XBOX
 				ULONGLONG ullOfferID_Full;
 				app.GetDLCFullOfferIDForPackID(m_initData->selectedSession->data.texturePackParentId,&ullOfferID_Full);
@@ -1743,8 +1825,6 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 				//uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION;
 				uiIDA[1]=IDS_CONFIRM_CANCEL;
 
-
-				// Give the player a warning about the texture pack missing
 				ui.RequestAlertMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, m_iPad,&UIScene_LoadOrJoinMenu::TexturePackDialogReturned,this);
 
 				return;
@@ -1762,7 +1842,6 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 		m_controlJoinTimer.setVisible( false );
 
 #ifdef _XBOX
-		// Reset the background downloading, in case we changed it by attempting to download a texture pack
 		XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);
 #endif
 
@@ -1799,7 +1878,7 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
     NetworkGameInitData *param = new NetworkGameInitData();
     param->seed = 0;
-    param->saveData = NULL;
+    param->saveData = nullptr;
     param->settings = app.GetGameHostOption( eGameHostOption_Tutorial );
     param->levelGen = levelGen;
 
@@ -1818,7 +1897,7 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
     LoadingInputParams *loadingParams = new LoadingInputParams();
     loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-    loadingParams->lpParam = (LPVOID)param;
+    loadingParams->lpParam = static_cast<LPVOID>(param);
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
     completionData->bShowBackground=TRUE;
@@ -1832,9 +1911,9 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 void UIScene_LoadOrJoinMenu::UpdateGamesListCallback(LPVOID pParam)
 {
-    if(pParam != NULL)
+    if(pParam != nullptr)
     {
-        UIScene_LoadOrJoinMenu *pScene = (UIScene_LoadOrJoinMenu *)pParam;
+        UIScene_LoadOrJoinMenu *pScene = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
         pScene->UpdateGamesList();
     }
 }
@@ -1854,17 +1933,23 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     }
 
 
-    FriendSessionInfo *pSelectedSession = NULL;
+    FriendSessionInfo *pSelectedSession = nullptr;
     if(DoesGamesListHaveFocus() && m_buttonListGames.getItemCount() > 0)
     {
         unsigned int nIndex = m_buttonListGames.getCurrentSelection();
+#ifdef _WINDOWS64
+        // Offset past the "Add Server" button
+        if (nIndex > 0)
+            pSelectedSession = m_currentSessions->at( nIndex - 1 );
+#else
         pSelectedSession = m_currentSessions->at( nIndex );
+#endif
     }
 
     SessionID selectedSessionId;
 	ZeroMemory(&selectedSessionId,sizeof(SessionID));
-    if( pSelectedSession != NULL )selectedSessionId = pSelectedSession->sessionId;
-    pSelectedSession = NULL;
+    if( pSelectedSession != nullptr )selectedSessionId = pSelectedSession->sessionId;
+    pSelectedSession = nullptr;
 
     m_controlJoinTimer.setVisible( false );
 
@@ -1874,12 +1959,41 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     int iY = -1;
     int iX=-1;
 
-    delete m_currentSessions;
-    m_currentSessions = g_NetworkManager.GetSessionList( m_iPad, 1, m_bShowingPartyGamesOnly );
+    vector<FriendSessionInfo*>* newSessions = g_NetworkManager.GetSessionList( m_iPad, 1, m_bShowingPartyGamesOnly );
+
+    if (m_currentSessions != NULL && m_currentSessions->size() == newSessions->size())
+    {
+        bool same = true;
+        for (size_t i = 0; i < newSessions->size(); i++)
+        {
+            if (memcmp(&(*m_currentSessions)[i]->sessionId, &(*newSessions)[i]->sessionId, sizeof(SessionID)) != 0 ||
+                wcscmp((*m_currentSessions)[i]->displayLabel ? (*m_currentSessions)[i]->displayLabel : L"",
+                       (*newSessions)[i]->displayLabel ? (*newSessions)[i]->displayLabel : L"") != 0)
+            {
+                same = false;
+                break;
+            }
+        }
+        if (same)
+        {
+            for (auto& it : *newSessions)
+                delete it;
+            delete newSessions;
+            return;
+        }
+    }
+
+    if (m_currentSessions)
+    {
+        for (auto& it : *m_currentSessions)
+            delete it;
+        delete m_currentSessions;
+    }
+    m_currentSessions = newSessions;
 
     // Update the xui list displayed
     unsigned int xuiListSize = m_buttonListGames.getItemCount();
-    unsigned int filteredListSize = (unsigned int)m_currentSessions->size();
+    unsigned int filteredListSize = static_cast<unsigned int>(m_currentSessions->size());
 
     BOOL gamesListHasFocus = DoesGamesListHaveFocus();
 
@@ -1911,6 +2025,11 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     // clear out the games list and re-fill
     m_buttonListGames.clearList();
 
+#ifdef _WINDOWS64
+    // Always add the "Add Server" button as the first entry in the games list
+    m_buttonListGames.addItem(wstring(L"Add Server"));
+#endif
+
     if( filteredListSize > 0 )
     {
         // Reset the focus to the selected session if it still exists
@@ -1930,12 +2049,12 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
                 HRESULT hr;
 
                 DWORD dwImageBytes=0;
-                PBYTE pbImageData=NULL;
+                PBYTE pbImageData=nullptr;
 
-                if(tp==NULL)
+                if(tp==nullptr)
                 {
                     DWORD dwBytes=0;
-                    PBYTE pbData=NULL;
+                    PBYTE pbData=nullptr;
                     app.GetTPD(sessionInfo->data.texturePackParentId,&pbData,&dwBytes);
 
                     // is it in the tpd data ?
@@ -1976,7 +2095,12 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
 
             if(memcmp( &selectedSessionId, &sessionInfo->sessionId, sizeof(SessionID) ) == 0)
             {
+#ifdef _WINDOWS64
+                // Offset past the "Add Server" button
+                m_buttonListGames.setCurrentSelection(sessionIndex + 1);
+#else
                 m_buttonListGames.setCurrentSelection(sessionIndex);
+#endif
                 break;
             }
             ++sessionIndex;
@@ -2134,9 +2258,9 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
     // Make our next save default to the name of the level
     StorageManager.SetSaveTitle(saveFile->getName().c_str());
 
-    __int64 fileSize = saveFile->length();
+    int64_t fileSize = saveFile->length();
     FileInputStream fis(*saveFile);
-    byteArray ba(fileSize);
+    byteArray ba(static_cast<unsigned int>(fileSize));
     fis.read(ba);
     fis.close();
 
@@ -2170,7 +2294,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
 
     LoadingInputParams *loadingParams = new LoadingInputParams();
     loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-    loadingParams->lpParam = (LPVOID)param;
+    loadingParams->lpParam = static_cast<LPVOID>(param);
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
     completionData->bShowBackground=TRUE;
@@ -2198,7 +2322,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
     mbstowcs(wSaveName, app.getRemoteStorage()->getSaveNameUTF8(), strlen(app.getRemoteStorage()->getSaveNameUTF8())+1); // plus null
     StorageManager.SetSaveTitle(wSaveName);
 
-    __int64 fileSize = cloudFile.length();
+    int64_t fileSize = cloudFile.length();
     FileInputStream fis(cloudFile);
     byteArray ba(fileSize);
     fis.read(ba);
@@ -2276,7 +2400,7 @@ static bool Win64_DeleteSaveDirectory(const wchar_t* wPath)
 
 int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
     // results switched for this dialog
 
 	// Check that we have a valid save selected (can get a bad index if the save list has been refreshed)
@@ -2298,7 +2422,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
                 if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0])
                 {
                     wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
-                    mbstowcs_s(NULL, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
+                    mbstowcs_s(nullptr, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
                     wchar_t wFolderPath[MAX_PATH] = {};
                     swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", wFilename);
                     bSuccess = Win64_DeleteSaveDirectory(wFolderPath);
@@ -2322,7 +2446,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
 int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 {
 	ui.EnterCallbackIdCriticalSection();
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam);
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(ui.GetSceneFromCallbackId((size_t)lpParam));
 
 	if(pClass)
 	{
@@ -2342,7 +2466,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 
 int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(LPVOID lpParam,bool bRes)
 {
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)lpParam;
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(lpParam);
 
     if(bRes)
     {
@@ -2374,7 +2498,7 @@ void UIScene_LoadOrJoinMenu::LoadRemoteFileFromDisk(char* remoteFilename)
 
 int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
 
     // results switched for this dialog
     // EMessage_ResultAccept means cancel
@@ -2387,14 +2511,14 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS
             {
                 wchar_t wSaveName[128];
                 ZeroMemory(wSaveName, 128 * sizeof(wchar_t));
-                mbstowcs_s(NULL, wSaveName, 128, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, _TRUNCATE);
+                mbstowcs_s(nullptr, wSaveName, 128, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, _TRUNCATE);
                 UIKeyboardInitData kbData;
                 kbData.title       = app.GetString(IDS_RENAME_WORLD_TITLE);
                 kbData.defaultText = wSaveName;
                 kbData.maxChars    = 25;
                 kbData.callback    = &UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback;
                 kbData.lpParam     = pClass;
-                kbData.pcMode      = !Win64_IsControllerConnected();
+                kbData.pcMode      = g_KBMInput.IsKBMActive();
                 ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
             }
 #elif defined _DURANGO
@@ -2504,7 +2628,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
 	if(bContinue==true)
 	{
 		SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId);
-		if(pSONYDLCInfo!=NULL)
+		if(pSONYDLCInfo!=nullptr)
 		{
 			char chName[42];
 			char chKeyName[20];
@@ -2513,7 +2637,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
 			memset(chSkuID,0,SCE_NP_COMMERCE2_SKU_ID_LEN);
 			// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 			// So we assume the first sku for the product is the one we want
-			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 			memset(chKeyName, 0, sizeof(chKeyName));
 			strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -2545,7 +2669,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
 
 int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-    UIScene_LoadOrJoinMenu *pClass = (UIScene_LoadOrJoinMenu *)pParam;
+    UIScene_LoadOrJoinMenu *pClass = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
 
     // Exit with or without saving
     if(result==C4JStorage::EMessage_ResultAccept)
@@ -2567,7 +2691,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 #endif
 
 		SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId);
-		if(pSONYDLCInfo!=NULL)
+		if(pSONYDLCInfo!=nullptr)
 		{
 			char chName[42];
 			char chKeyName[20];
@@ -2576,7 +2700,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 			memset(chSkuID,0,SCE_NP_COMMERCE2_SKU_ID_LEN);
 			// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 			// So we assume the first sku for the product is the one we want
-			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 			memset(chKeyName, 0, sizeof(chKeyName));
 			strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -2610,7 +2734,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 				wstring ProductId;
 				app.GetDLCFullOfferIDForPackID(pClass->m_initData->selectedSession->data.texturePackParentId,ProductId);
 
-				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),nullptr,nullptr);
 			}
 			else
 			{
@@ -2802,7 +2926,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
     pMinecraft->progressRenderer->progressStart(IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD);
     pMinecraft->progressRenderer->progressStage( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD );
 
-	ConsoleSaveFile* pSave = NULL;
+	ConsoleSaveFile* pSave = nullptr;
 
 	pClass->m_eSaveTransferState = eSaveTransfer_GetRemoteSaveInfo;
 
@@ -2857,10 +2981,10 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				const char* pNameUTF8 = app.getRemoteStorage()->getSaveNameUTF8();
 				mbstowcs(wSaveName, pNameUTF8, strlen(pNameUTF8)+1); // plus null
 				StorageManager.SetSaveTitle(wSaveName);
-				PBYTE pbThumbnailData=NULL;
+				PBYTE pbThumbnailData=nullptr;
 				DWORD dwThumbnailDataSize=0;
 
-				PBYTE pbDataSaveImage=NULL;
+				PBYTE pbDataSaveImage=nullptr;
 				DWORD dwDataSizeSaveImage=0;
 
 				StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
@@ -3021,10 +3145,10 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 
                 StorageManager.ResetSaveData();
 				{
-					PBYTE pbThumbnailData=NULL;
+					PBYTE pbThumbnailData=nullptr;
 					DWORD dwThumbnailDataSize=0;
 
-					PBYTE pbDataSaveImage=NULL;
+					PBYTE pbDataSaveImage=nullptr;
 					DWORD dwDataSizeSaveImage=0;
 
 					StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
@@ -3232,7 +3356,7 @@ void UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam, SonyRemoteStor
 }
 ConsoleSaveFile* UIScene_LoadOrJoinMenu::SonyCrossSaveConvert()
 {
-    return NULL;
+    return nullptr;
 }
 
 void UIScene_LoadOrJoinMenu::CancelSaveTransferCallback(LPVOID lpParam)
@@ -3455,7 +3579,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 
 	SaveTransferStateContainer *pStateContainer = (SaveTransferStateContainer *) lpParameter;
     Minecraft *pMinecraft=Minecraft::GetInstance();
-    ConsoleSaveFile* pSave = NULL;
+    ConsoleSaveFile* pSave = nullptr;
 
 	while(StorageManager.SaveTransferClearState()!=C4JStorage::eSaveTransfer_Idle)
 	{
@@ -3542,7 +3666,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 						bool bHostOptionsRead = false;
 						unsigned int uiHostOptions = 0;
 						DWORD dwTexturePack;
-						__int64 seedVal;
+						int64_t seedVal;
 
 						char szSeed[50];
 						ZeroMemory(szSeed,50);
@@ -3557,7 +3681,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 
 						int iTextMetadataBytes = app.CreateImageTextData(bTextMetadata, seedVal, true, uiHostOptions, dwTexturePack);
 						// set the icon and save image
-						StorageManager.SetSaveImages(ba.data, ba.length, NULL, 0, bTextMetadata, iTextMetadataBytes);
+						StorageManager.SetSaveImages(ba.data, ba.length, nullptr, 0, bTextMetadata, iTextMetadataBytes);
 
                         delete ba.data;
                     }
@@ -3720,12 +3844,12 @@ void UIScene_LoadOrJoinMenu::RequestFileData( SaveTransferStateContainer *pClass
         File targetFile( wstring(L"FakeTMSPP\\").append(filename) );
         if(targetFile.exists())
         {
-            HANDLE hSaveFile = CreateFile( targetFile.getPath().c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
+            HANDLE hSaveFile = CreateFile( targetFile.getPath().c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, nullptr);
 
             m_debugTransferDetails.pbData = new BYTE[m_debugTransferDetails.ulFileLen];
 
             DWORD numberOfBytesRead = 0;
-            ReadFile( hSaveFile,m_debugTransferDetails.pbData,m_debugTransferDetails.ulFileLen,&numberOfBytesRead,NULL);
+            ReadFile( hSaveFile,m_debugTransferDetails.pbData,m_debugTransferDetails.ulFileLen,&numberOfBytesRead,nullptr);
             assert(numberOfBytesRead == m_debugTransferDetails.ulFileLen);
 
             CloseHandle(hSaveFile);
@@ -3753,7 +3877,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam,C4JStorage::SAVE
     app.DebugPrintf("Save Transfer - size is %d\n",pSaveTransferDetails->ulFileLen);
 
     // if the file data is null, then assume this is the file size retrieval
-    if(pSaveTransferDetails->pbData==NULL)
+    if(pSaveTransferDetails->pbData==nullptr)
     {
         pClass->m_eSaveTransferState=C4JStorage::eSaveTransfer_FileSizeRetrieved;
         UIScene_LoadOrJoinMenu::s_ulFileSize=pSaveTransferDetails->ulFileLen;
@@ -4013,3 +4137,168 @@ int UIScene_LoadOrJoinMenu::CopySaveErrorDialogFinishedCallback(void *pParam,int
 }
 
 #endif // _XBOX_ONE
+#ifdef _WINDOWS64
+// adding servers bellow
+
+void UIScene_LoadOrJoinMenu::BeginAddServer()
+{
+    m_addServerPhase = eAddServer_IP;
+    m_addServerIP.clear();
+    m_addServerPort.clear();
+
+    UIKeyboardInitData kbData;
+    kbData.title       = L"Server Address";
+    kbData.defaultText = L"";
+    kbData.maxChars    = 128;
+    kbData.callback    = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback;
+    kbData.lpParam     = this;
+    kbData.pcMode      = g_KBMInput.IsKBMActive();
+    ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
+}
+
+int UIScene_LoadOrJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes)
+{
+    UIScene_LoadOrJoinMenu *pClass = static_cast<UIScene_LoadOrJoinMenu*>(lpParam);
+
+    if (!bRes)
+    {
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+        return 0;
+    }
+
+    uint16_t ui16Text[256];
+    ZeroMemory(ui16Text, sizeof(ui16Text));
+    Win64_GetKeyboardText(ui16Text, 256);
+
+    wchar_t wBuf[256] = {};
+    for (int k = 0; k < 255 && ui16Text[k]; k++)
+        wBuf[k] = static_cast<wchar_t>(ui16Text[k]);
+
+    if (wBuf[0] == 0)
+    {
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+        return 0;
+    }
+
+    switch (pClass->m_addServerPhase)
+    {
+    case eAddServer_IP:
+    {
+        pClass->m_addServerIP = wBuf;
+        pClass->m_addServerPhase = eAddServer_Port;
+
+        UIKeyboardInitData kbData;
+        kbData.title       = L"Server Port";
+        kbData.defaultText = L"25565";
+        kbData.maxChars    = 6;
+        kbData.callback    = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback;
+        kbData.lpParam     = pClass;
+        kbData.pcMode      = g_KBMInput.IsKBMActive();
+        ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+        break;
+    }
+    case eAddServer_Port:
+    {
+        pClass->m_addServerPort = wBuf;
+        pClass->m_addServerPhase = eAddServer_Name;
+
+        UIKeyboardInitData kbData;
+        kbData.title       = L"Server Name";
+        kbData.defaultText = L"Minecraft Server";
+        kbData.maxChars    = 64;
+        kbData.callback    = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback;
+        kbData.lpParam     = pClass;
+        kbData.pcMode      = g_KBMInput.IsKBMActive();
+        ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+        break;
+    }
+    case eAddServer_Name:
+    {
+        wstring name = wBuf;
+        pClass->AppendServerToFile(pClass->m_addServerIP, pClass->m_addServerPort, name);
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+
+        g_NetworkManager.ForceFriendsSessionRefresh();
+        break;
+    }
+    default:
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+        break;
+    }
+
+    return 0;
+}
+
+void UIScene_LoadOrJoinMenu::AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name)
+{
+    char narrowIP[256] = {};
+    char narrowPort[16] = {};
+    char narrowName[256] = {};
+    wcstombs(narrowIP, ip.c_str(), sizeof(narrowIP) - 1);
+    wcstombs(narrowPort, port.c_str(), sizeof(narrowPort) - 1);
+    wcstombs(narrowName, name.c_str(), sizeof(narrowName) - 1);
+
+    uint16_t portNum = static_cast<uint16_t>(atoi(narrowPort));
+
+    struct ServerEntry { std::string ip; uint16_t port; std::string name; };
+    std::vector<ServerEntry> entries;
+
+    FILE* file = fopen("servers.db", "rb");
+    if (file)
+    {
+        char magic[4] = {};
+        if (fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+        {
+            uint32_t version = 0, count = 0;
+            fread(&version, sizeof(uint32_t), 1, file);
+            fread(&count, sizeof(uint32_t), 1, file);
+            if (version == 1)
+            {
+                for (uint32_t s = 0; s < count; s++)
+                {
+                    uint16_t ipLen = 0, p = 0, nameLen = 0;
+                    if (fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+                    if (ipLen == 0 || ipLen > 256) break;
+                    char ipBuf[257] = {};
+                    if (fread(ipBuf, 1, ipLen, file) != ipLen) break;
+                    if (fread(&p, sizeof(uint16_t), 1, file) != 1) break;
+                    if (fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+                    if (nameLen > 256) break;
+                    char nameBuf[257] = {};
+                    if (nameLen > 0 && fread(nameBuf, 1, nameLen, file) != nameLen) break;
+                    entries.push_back({std::string(ipBuf), p, std::string(nameBuf)});
+                }
+            }
+        }
+        fclose(file);
+    }
+
+    entries.push_back({std::string(narrowIP), portNum, std::string(narrowName)});
+
+    file = fopen("servers.db", "wb");
+    if (file)
+    {
+        fwrite("MCSV", 1, 4, file);
+        uint32_t version = 1;
+        uint32_t count = static_cast<uint32_t>(entries.size());
+        fwrite(&version, sizeof(uint32_t), 1, file);
+        fwrite(&count, sizeof(uint32_t), 1, file);
+
+        for (size_t i = 0; i < entries.size(); i++)
+        {
+            uint16_t ipLen = static_cast<uint16_t>(entries[i].ip.length());
+            fwrite(&ipLen, sizeof(uint16_t), 1, file);
+            fwrite(entries[i].ip.c_str(), 1, ipLen, file);
+            fwrite(&entries[i].port, sizeof(uint16_t), 1, file);
+            uint16_t nameLen = static_cast<uint16_t>(entries[i].name.length());
+            fwrite(&nameLen, sizeof(uint16_t), 1, file);
+            fwrite(entries[i].name.c_str(), 1, nameLen, file);
+        }
+        fclose(file);
+    }
+}
+#endif // _WINDOWS64
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h
index 3599aa37..9f5fe17f 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h
@@ -175,6 +175,18 @@ public:
 
 private:
 	void CheckAndJoinGame(int gameIndex);
+
+#ifdef _WINDOWS64
+	static const int ADD_SERVER_BUTTON_INDEX = 0;
+	enum eAddServerPhase { eAddServer_Idle, eAddServer_IP, eAddServer_Port, eAddServer_Name };
+	eAddServerPhase m_addServerPhase;
+	wstring m_addServerIP;
+	wstring m_addServerPort;
+	void BeginAddServer();
+	void AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name);
+	static int AddServerKeyboardCallback(LPVOID lpParam, bool bRes);
+#endif
+
 #if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__)
 	static int MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static int PSN_SignInReturned(void *pParam,bool bContinue, int iPad);
diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
index fe743adc..93f1edf1 100644
--- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
@@ -12,7 +12,7 @@
 
 Random *UIScene_MainMenu::random = new Random();
 
-EUIScene UIScene_MainMenu::eNavigateWhenReady = (EUIScene) -1;
+EUIScene UIScene_MainMenu::eNavigateWhenReady = static_cast<EUIScene>(-1);
 
 UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -33,29 +33,29 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bIgnorePress=false;
 
 
-	m_buttons[(int)eControl_PlayGame].init(IDS_PLAY_GAME,eControl_PlayGame);
+	m_buttons[static_cast<int>(eControl_PlayGame)].init(IDS_PLAY_GAME,eControl_PlayGame);
 
 #ifdef _XBOX_ONE
 	if(!ProfileManager.IsFullVersion()) m_buttons[(int)eControl_PlayGame].setLabel(IDS_PLAY_TRIAL_GAME);
 	app.SetReachedMainMenu();
 #endif
 
-	m_buttons[(int)eControl_Leaderboards].init(IDS_LEADERBOARDS,eControl_Leaderboards);
-	m_buttons[(int)eControl_Achievements].init( (UIString)IDS_ACHIEVEMENTS,eControl_Achievements);
-	m_buttons[(int)eControl_HelpAndOptions].init(IDS_HELP_AND_OPTIONS,eControl_HelpAndOptions);
+	m_buttons[static_cast<int>(eControl_Leaderboards)].init(IDS_LEADERBOARDS,eControl_Leaderboards);
+	m_buttons[static_cast<int>(eControl_Achievements)].init( (UIString)IDS_ACHIEVEMENTS,eControl_Achievements);
+	m_buttons[static_cast<int>(eControl_HelpAndOptions)].init(IDS_HELP_AND_OPTIONS,eControl_HelpAndOptions);
 	if(ProfileManager.IsFullVersion())
 	{
 		m_bTrialVersion=false;
-		m_buttons[(int)eControl_UnlockOrDLC].init(IDS_DOWNLOADABLECONTENT,eControl_UnlockOrDLC);
+		m_buttons[static_cast<int>(eControl_UnlockOrDLC)].init(IDS_DOWNLOADABLECONTENT,eControl_UnlockOrDLC);
 	}
 	else
 	{
 		m_bTrialVersion=true;
-		m_buttons[(int)eControl_UnlockOrDLC].init(IDS_UNLOCK_FULL_GAME,eControl_UnlockOrDLC);
+		m_buttons[static_cast<int>(eControl_UnlockOrDLC)].init(IDS_UNLOCK_FULL_GAME,eControl_UnlockOrDLC);
 	}
 
 #ifndef _DURANGO
-	m_buttons[(int)eControl_Exit].init(app.GetString(IDS_EXIT_GAME),eControl_Exit);
+	m_buttons[static_cast<int>(eControl_Exit)].init(app.GetString(IDS_EXIT_GAME),eControl_Exit);
 #else
 	m_buttons[(int)eControl_XboxHelp].init(IDS_XBOX_HELP_APP, eControl_XboxHelp);
 #endif
@@ -104,7 +104,7 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bLoadTrialOnNetworkManagerReady = false;
 
 	// 4J Stu - Clear out any loaded game rules
-	app.setLevelGenerationOptions(NULL);
+	app.setLevelGenerationOptions(nullptr);
 
 	// 4J Stu - Reset the leaving game flag so that we correctly handle signouts while in the menus
 	g_NetworkManager.ResetLeavingGame();
@@ -182,7 +182,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack)
 	if(navBack && ProfileManager.IsFullVersion())
 	{
 		// Replace the Unlock Full Game with Downloadable Content
-		m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT);
+		m_buttons[static_cast<int>(eControl_UnlockOrDLC)].setLabel(IDS_DOWNLOADABLECONTENT);
 	}
 
 #if TO_BE_IMPLEMENTED
@@ -196,7 +196,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack)
 #ifdef __PSVITA__
 	int splashIndex = eSplashRandomStart + 2 + random->nextInt( (int)m_splashes.size() - (eSplashRandomStart + 2) ); 
 #else
-	int splashIndex = eSplashRandomStart + 1 + random->nextInt( (int)m_splashes.size() - (eSplashRandomStart + 1) );
+	int splashIndex = eSplashRandomStart + 1 + random->nextInt( static_cast<int>(m_splashes.size()) - (eSplashRandomStart + 1) );
 #endif
 
 	// Override splash text on certain dates
@@ -303,12 +303,12 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 	int primaryPad = ProfileManager.GetPrimaryPad();
 	
 #ifdef _XBOX_ONE
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad, const int iController) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad, const int iController) = nullptr;
 #else
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = nullptr;
 #endif
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_PlayGame:
 #ifdef __ORBIS__
@@ -368,7 +368,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 			UINT uiIDA[2];
 			uiIDA[0]=IDS_CANCEL;
 			uiIDA[1]=IDS_OK;
-			ui.RequestErrorMessage(IDS_WARNING_ARCADE_TITLE, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
+			ui.RequestErrorMessage(IDS_WINDOWS_EXIT, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
 		}
 		else
 		{
@@ -396,7 +396,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 	bool confirmUser = false;
 
 	// Note: if no sign in returned func, assume this isn't required
-	if (signInReturnedFunc != NULL)
+	if (signInReturnedFunc != nullptr)
 	{
 		if(ProfileManager.IsSignedIn(primaryPad))
 		{
@@ -466,10 +466,10 @@ void UIScene_MainMenu::customDrawSplash(IggyCustomDrawCallbackRegion *region)
 
 	// 4J Stu - Move this to the ctor when the main menu is not the first scene we navigate to
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 
 	// Setup GDraw, normal game render states and matrices
@@ -513,7 +513,7 @@ void UIScene_MainMenu::customDrawSplash(IggyCustomDrawCallbackRegion *region)
 
 int UIScene_MainMenu::MustSignInReturned(void *pParam, int iPad, C4JStorage::EMessageResult result)
 {
-	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
+	UIScene_MainMenu* pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
@@ -643,7 +643,7 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,
 int UIScene_MainMenu::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu *pClass = (UIScene_MainMenu *)pParam;
+	UIScene_MainMenu *pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if(bContinue)
 	{
@@ -714,7 +714,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
 int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, int iPad)
 #endif
 {
-	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
+	UIScene_MainMenu* pClass = static_cast<UIScene_MainMenu *>(pParam);
 	
 	if(bContinue)
 	{
@@ -916,7 +916,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,in
 int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu *pClass = (UIScene_MainMenu *)pParam;
+	UIScene_MainMenu *pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if(bContinue)
 	{
@@ -940,7 +940,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,in
 		{
 			bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 			if(bContentRestricted)
 			{				
@@ -986,7 +986,7 @@ int UIScene_MainMenu::Achievements_SignInReturned(void *pParam,bool bContinue,in
 int UIScene_MainMenu::Achievements_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu *pClass = (UIScene_MainMenu *)pParam;
+	UIScene_MainMenu *pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if (bContinue)
 	{
@@ -1020,7 +1020,7 @@ int UIScene_MainMenu::UnlockFullGame_SignInReturned(void *pParam,bool bContinue,
 int UIScene_MainMenu::UnlockFullGame_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
+	UIScene_MainMenu* pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if (bContinue)
 	{
@@ -1098,7 +1098,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = nullptr;
 
 	// 4J-PB - Check if there is a patch for the game
 	pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -1141,7 +1141,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 
 // 		UINT uiIDA[1];
 // 		uiIDA[0]=IDS_OK;
-// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,NULL,pClass);
+// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,nullptr,pClass);
 	}
 
 	// Check if PSN is unavailable because of age restriction
@@ -1157,7 +1157,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 	bool confirmUser = false;
 
 	// Note: if no sign in returned func, assume this isn't required
-	if (signInReturnedFunc != NULL)
+	if (signInReturnedFunc != nullptr)
 	{
 		if(ProfileManager.IsSignedIn(primaryPad))
 		{
@@ -1187,7 +1187,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = nullptr;
 
 	// 4J-PB - Check if there is a patch for the game
 	pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -1228,7 +1228,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 
 // 		UINT uiIDA[1];
 // 		uiIDA[0]=IDS_OK;
-// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,NULL,pClass);
+// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,nullptr,pClass);
 	}
 
 	bool confirmUser = false;
@@ -1247,7 +1247,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 	}
 
 	// Note: if no sign in returned func, assume this isn't required
-	if (signInReturnedFunc != NULL)
+	if (signInReturnedFunc != nullptr)
 	{
 		if(ProfileManager.IsSignedIn(primaryPad))
 		{
@@ -1600,7 +1600,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad)
 
 		bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-		ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+		ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 		if(bContentRestricted)
 		{
@@ -1608,7 +1608,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad)
 			// you can't see leaderboards
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
-			ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),NULL,this);
+			ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),nullptr,this);
 #endif
 		}
 		else
@@ -1669,7 +1669,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 
 // 			UINT uiIDA[1];
 // 			uiIDA[0]=IDS_OK;
-// 			ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,NULL,this);
+// 			ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,nullptr,this);
 			return;
 		}
 
@@ -1704,7 +1704,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 				{
 					bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-					ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+					ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 					if(bContentRestricted)
 					{
@@ -1713,7 +1713,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 						// you can't see the store
 						UINT uiIDA[1];
 						uiIDA[0]=IDS_CONFIRM_OK;
-						ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),NULL,this);
+						ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),nullptr,this);
 #endif
 					}
 					else
@@ -1898,7 +1898,7 @@ void UIScene_MainMenu::tick()
 		{
 			app.DebugPrintf("[MainMenu] Navigating away from MainMenu.\n");
 			ui.NavigateToScene(lockedProfile, eNavigateWhenReady);
-			eNavigateWhenReady = (EUIScene) -1;
+			eNavigateWhenReady = static_cast<EUIScene>(-1);
 		}
 #ifdef _DURANGO
 		else
@@ -1925,7 +1925,7 @@ void UIScene_MainMenu::tick()
 
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -2102,7 +2102,7 @@ void UIScene_MainMenu::LoadTrial(void)
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = 0;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->settings = app.GetGameHostOption( eGameHostOption_Tutorial ) | app.GetGameHostOption(eGameHostOption_DisableSaving);
 
 	vector<LevelGenerationOptions *> *generators = app.getLevelGenerators();
@@ -2110,7 +2110,7 @@ void UIScene_MainMenu::LoadTrial(void)
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -2129,7 +2129,7 @@ void UIScene_MainMenu::LoadTrial(void)
 
 void UIScene_MainMenu::handleUnlockFullVersion()
 {
-	m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT,true);
+	m_buttons[static_cast<int>(eControl_UnlockOrDLC)].setLabel(IDS_DOWNLOADABLECONTENT,true);
 }
 
 
diff --git a/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp b/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp
index 6b8dc552..7a0749d4 100644
--- a/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp
@@ -7,7 +7,7 @@ UIScene_MessageBox::UIScene_MessageBox(int iPad, void *initData, UILayer *parent
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	MessageBoxInfo *param = (MessageBoxInfo *)initData;
+	MessageBoxInfo *param = static_cast<MessageBoxInfo *>(initData);
 
 	m_buttonCount = param->uiOptionC;
 
@@ -41,7 +41,7 @@ UIScene_MessageBox::UIScene_MessageBox(int iPad, void *initData, UILayer *parent
 	m_labelTitle.init(app.GetString(param->uiTitle));
 	m_labelContent.init(app.GetString(param->uiText));
 
-	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , NULL );
+	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , nullptr );
 
 	m_Func = param->Func;
 	m_lpParam = param->lpParam;
@@ -84,10 +84,10 @@ void UIScene_MessageBox::handleReload()
 	value[0].number = m_buttonCount;
 
 	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = (F64)getControlFocus();
+	value[1].number = static_cast<F64>(getControlFocus());
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcInit , 2 , value );
 
-	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , NULL );
+	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , nullptr );
 }
 
 void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
@@ -120,7 +120,7 @@ void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool presse
 void UIScene_MessageBox::handlePress(F64 controlId, F64 childId)
 {
 	C4JStorage::EMessageResult result = C4JStorage::EMessage_Cancelled;
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case 0:
 		result = C4JStorage::EMessage_ResultAccept;
diff --git a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
index 998679ca..118712a4 100644
--- a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
@@ -19,8 +19,8 @@ UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void *initData, UIL
 	message=app.FormatHTMLString(m_iPad,message);
 
 	vector<wstring> paragraphs;
-	int lastIndex = 0;
-	for (	int index = message.find(L"\r\n", lastIndex, 2);
+	size_t lastIndex = 0;
+	for (	size_t index = message.find(L"\r\n", lastIndex, 2);
 			index != wstring::npos; 
 			index = message.find(L"\r\n", lastIndex, 2)
 		)
@@ -100,7 +100,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool
 
 void UIScene_NewUpdateMessage::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		{
diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
index 6f502db8..7cec38b3 100644
--- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
@@ -101,9 +101,9 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 	TelemetryManager->RecordPauseOrInactive(m_iPad);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(false);
@@ -114,9 +114,9 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 UIScene_PauseMenu::~UIScene_PauseMenu()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(true);
@@ -506,7 +506,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 {
 	if(m_bIgnoreInput) return;
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case BUTTON_PAUSE_RESUMEGAME:
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
@@ -593,7 +593,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 			{	
 				bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-				ProfileManager.GetChatAndContentRestrictions(m_iPad,true,NULL,&bContentRestricted,NULL);
+				ProfileManager.GetChatAndContentRestrictions(m_iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 				if(bContentRestricted)
 				{
@@ -654,9 +654,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				if(m_iPad==ProfileManager.GetPrimaryPad())
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
@@ -723,9 +723,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				else
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Exited);
@@ -741,9 +741,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				if(m_iPad==ProfileManager.GetPrimaryPad())
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}	
 
 					// adjust the trial time played
@@ -759,9 +759,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				else
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Exited);
@@ -839,7 +839,7 @@ void UIScene_PauseMenu::PerformActionSaveGame()
 	if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 	{
 		TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-		DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+		DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 
 		m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 
@@ -979,7 +979,7 @@ int UIScene_PauseMenu::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -1003,7 +1003,7 @@ int UIScene_PauseMenu::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::
 
 int UIScene_PauseMenu::SaveGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
+	UIScene_PauseMenu* pClass = static_cast<UIScene_PauseMenu *>(ui.GetSceneFromCallbackId((size_t)pParam));
 	if(pClass) pClass->SetIgnoreInput(false);
 
 	if(bContinue==true)
@@ -1112,7 +1112,7 @@ int UIScene_PauseMenu::ViewLeaderboards_SignInReturned(void *pParam,bool bContin
 		{
 #ifndef __ORBIS__
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(pClass->m_iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(pClass->m_iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				// you can't see leaderboards
@@ -1183,7 +1183,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 #ifndef __ORBIS__
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -1203,7 +1203,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
 				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chKeyName[20];
@@ -1214,7 +1214,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 					// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 					// So we assume the first sku for the product is the one we want
 
-					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 					memset(chKeyName, 0, sizeof(chKeyName));
 					strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -1260,7 +1260,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue
 #ifndef __ORBIS__
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -1280,7 +1280,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
 				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chKeyName[20];
@@ -1291,7 +1291,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue
 					// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 					// So we assume the first sku for the product is the one we want
 
-					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 					memset(chKeyName, 0, sizeof(chKeyName));
 					strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
index 0cb6cf2b..76676561 100644
--- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
@@ -11,7 +11,7 @@ UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILaye
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_signInInfo = *((SignInInfo *)_initData);
+	m_signInInfo = *static_cast<SignInInfo *>(_initData);
 
 	m_bIgnoreInput = false;
 	
@@ -167,7 +167,7 @@ int UIScene_QuadrantSignin::SignInReturned(void *pParam,bool bContinue, int iPad
 {
 	app.DebugPrintf("SignInReturned for pad %d\n", iPad);
 
-	UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)pParam;
+	UIScene_QuadrantSignin *pClass = static_cast<UIScene_QuadrantSignin *>(pParam);
 
 #ifdef _XBOX_ONE
 	if(bContinue && pClass->m_signInInfo.requireOnline && ProfileManager.IsSignedIn(iPad))
@@ -264,7 +264,7 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
 		value[0].number = iPad;
 
 		value[1].type = IGGY_DATATYPE_number;
-		value[1].number = (int)state;
+		value[1].number = static_cast<int>(state);
 
 		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetControllerStatus , 2 , value );
 	}
@@ -272,9 +272,9 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
 
 int UIScene_QuadrantSignin::AvatarReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)lpParam;
+	UIScene_QuadrantSignin *pClass = static_cast<UIScene_QuadrantSignin *>(lpParam);
 	app.DebugPrintf(app.USER_SR,"AvatarReturned callback\n");
-	if(pbThumbnail != NULL)
+	if(pbThumbnail != nullptr)
 	{
 		// 4J-JEV - Added to ensure each new texture gets a unique name.
 		static unsigned int quadrantImageCount = 0;
diff --git a/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp
index 3b67f79e..c713a390 100644
--- a/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp
@@ -36,7 +36,7 @@ void UIScene_ReinstallMenu::updateTooltips()
 
 void UIScene_ReinstallMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
diff --git a/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp b/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp
index b58f86fd..0b8e0ca4 100644
--- a/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp
@@ -19,7 +19,7 @@ UIScene_SaveMessage::UIScene_SaveMessage(int iPad, void *initData, UILayer *pare
 	IggyDataValue result;
 
 	// Russian needs to resize the box
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , nullptr );
 
 	// 4J-PB - If we have a signed in user connected, let's get the DLC now
 	for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
@@ -101,7 +101,7 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, bool press
 
 void UIScene_SaveMessage::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp
index 6d892d70..083fbd35 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp
@@ -47,7 +47,7 @@ void UIScene_SettingsAudioMenu::updateTooltips()
 
 void UIScene_SettingsAudioMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -93,8 +93,8 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, bool
 void UIScene_SettingsAudioMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Music:
 		m_sliderMusic.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp
index d5447f77..7dbd243b 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp
@@ -47,7 +47,7 @@ void UIScene_SettingsControlMenu::updateTooltips()
 
 void UIScene_SettingsControlMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -93,8 +93,8 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, bo
 void UIScene_SettingsControlMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_SensitivityInGame:
 		m_sliderSensitivityInGame.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
index 0a76a5e5..b258d8c3 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
@@ -2,24 +2,26 @@
 #include "UI.h"
 #include "UIScene_SettingsGraphicsMenu.h"
 #include "..\..\Minecraft.h"
+#include "..\..\Options.h"
 #include "..\..\GameRenderer.h"
 
 namespace
 {
-	const int FOV_MIN = 70;
-	const int FOV_MAX = 110;
-	const int FOV_SLIDER_MAX = 100;
+    constexpr int FOV_MIN = 70;
+    constexpr int FOV_MAX = 110;
+    constexpr int FOV_SLIDER_MAX = 100;
 
-	int clampFov(int value)
+	int ClampFov(int value)
 	{
 		if (value < FOV_MIN) return FOV_MIN;
 		if (value > FOV_MAX) return FOV_MAX;
 		return value;
 	}
 
-	int fovToSliderValue(float fov)
+    [[maybe_unused]]
+    int FovToSliderValue(float fov)
 	{
-		int clampedFov = clampFov((int)(fov + 0.5f));
+		const int clampedFov = ClampFov(static_cast<int>(fov + 0.5f));
 		return ((clampedFov - FOV_MIN) * FOV_SLIDER_MAX) / (FOV_MAX - FOV_MIN);
 	}
 
@@ -31,13 +33,31 @@ namespace
 	}
 }
 
+int UIScene_SettingsGraphicsMenu::LevelToDistance(int level)
+{
+	static const int table[6] = {2,4,8,16,32,64};
+	if(level < 0) level = 0;
+	if(level > 5) level = 5;
+	return table[level];
+}
+
+int UIScene_SettingsGraphicsMenu::DistanceToLevel(int dist)
+{
+    static const int table[6] = {2,4,8,16,32,64};
+    for(int i = 0; i < 6; i++){
+        if(table[i] == dist)
+            return i;
+    }
+    return 3;
+}
+
 UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	Minecraft* pMinecraft = Minecraft::GetInstance();
 	
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_checkboxClouds.init(app.GetString(IDS_CHECKBOX_RENDER_CLOUDS),eControl_Clouds,(app.GetGameSettings(m_iPad,eGameSetting_Clouds)!=0));
 	m_checkboxBedrockFog.init(app.GetString(IDS_CHECKBOX_RENDER_BEDROCKFOG),eControl_BedrockFog,(app.GetGameSettings(m_iPad,eGameSetting_BedrockFog)!=0));
@@ -45,21 +65,25 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initD
 
 	
 	WCHAR TempString[256];
+
+	swprintf(TempString, 256, L"Render Distance: %d",app.GetGameSettings(m_iPad,eGameSetting_RenderDistance));	
+	m_sliderRenderDistance.init(TempString,eControl_RenderDistance,0,5,DistanceToLevel(app.GetGameSettings(m_iPad,eGameSetting_RenderDistance)));
 	
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma));	
+	swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma));	
 	m_sliderGamma.init(TempString,eControl_Gamma,0,100,app.GetGameSettings(m_iPad,eGameSetting_Gamma));
 
-	int initialFov = clampFov((int)(pMinecraft->gameRenderer->GetFovVal() + 0.5f));
-	swprintf((WCHAR*)TempString, 256, L"FOV: %d", initialFov);
-	m_sliderFOV.init(TempString, eControl_FOV, 0, FOV_SLIDER_MAX, fovToSliderValue((float)initialFov));
+    const int initialFovSlider = app.GetGameSettings(m_iPad, eGameSetting_FOV);
+	const int initialFovDeg = sliderValueToFov(initialFovSlider);
+	swprintf(TempString, 256, L"FOV: %d", initialFovDeg);
+	m_sliderFOV.init(TempString, eControl_FOV, 0, FOV_SLIDER_MAX, initialFovSlider);
 	
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity));	
+	swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity));	
 	m_sliderInterfaceOpacity.init(TempString,eControl_InterfaceOpacity,0,100,app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity));
 
 	doHorizontalResizeCheck();
-	
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
-	bool bIsPrimaryPad=(ProfileManager.GetPrimaryPad()==m_iPad);
+
+	const bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
+	const bool bIsPrimaryPad=(ProfileManager.GetPrimaryPad()==m_iPad);
 	// if we're not in the game, we need to use basescene 0 
 	if(bInGame)
 	{
@@ -113,7 +137,7 @@ void UIScene_SettingsGraphicsMenu::updateTooltips()
 
 void UIScene_SettingsGraphicsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	const bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -164,14 +188,29 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
 void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	const int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
+	case eControl_RenderDistance:
+		{
+			m_sliderRenderDistance.handleSliderMove(value);
+
+			const int dist = LevelToDistance(value);
+
+			app.SetGameSettings(m_iPad,eGameSetting_RenderDistance,dist);
+
+			const Minecraft* mc = Minecraft::GetInstance();
+			mc->options->viewDistance = 3 - value;
+			swprintf(TempString,256,L"Render Distance: %d",dist);
+			m_sliderRenderDistance.setLabel(TempString);
+		}
+		break;
+
 	case eControl_Gamma:
 		m_sliderGamma.handleSliderMove(value);
 		
 		app.SetGameSettings(m_iPad,eGameSetting_Gamma,value);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),value);
+		swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),value);
 		m_sliderGamma.setLabel(TempString);
 
 		break;
@@ -179,12 +218,13 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentVal
 	case eControl_FOV:
 		{
 			m_sliderFOV.handleSliderMove(value);
-			Minecraft* pMinecraft = Minecraft::GetInstance();
-			int fovValue = sliderValueToFov(value);
-			pMinecraft->gameRenderer->SetFovVal((float)fovValue);
-			WCHAR TempString[256];
-			swprintf((WCHAR*)TempString, 256, L"FOV: %d", fovValue);
-			m_sliderFOV.setLabel(TempString);
+			const Minecraft* pMinecraft = Minecraft::GetInstance();
+			const int fovValue = sliderValueToFov(value);
+			pMinecraft->gameRenderer->SetFovVal(static_cast<float>(fovValue));
+			app.SetGameSettings(m_iPad, eGameSetting_FOV, value);
+			WCHAR tempString[256];
+			swprintf(tempString, 256, L"FOV: %d", fovValue);
+			m_sliderFOV.setLabel(tempString);
 		}
 		break;
 
@@ -192,7 +232,7 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentVal
 		m_sliderInterfaceOpacity.handleSliderMove(value);
 		
 		app.SetGameSettings(m_iPad,eGameSetting_InterfaceOpacity,value);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),value);	
+		swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),value);	
 		m_sliderInterfaceOpacity.setLabel(TempString);
 
 		break;
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
index c6e1e394..99022c83 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "UIScene.h"
+#include "Common/UI/UIControl_CheckBox.h"
+#include "Common/UI/UIControl_Slider.h"
 
 class UIScene_SettingsGraphicsMenu : public UIScene
 {
@@ -10,17 +12,19 @@ private:
 		eControl_Clouds,
 		eControl_BedrockFog,
 		eControl_CustomSkinAnim,
+		eControl_RenderDistance,
 		eControl_Gamma,
 		eControl_FOV,
 		eControl_InterfaceOpacity
 	};
 
 	UIControl_CheckBox m_checkboxClouds, m_checkboxBedrockFog, m_checkboxCustomSkinAnim; // Checkboxes
-	UIControl_Slider m_sliderGamma, m_sliderFOV, m_sliderInterfaceOpacity; // Sliders
+	UIControl_Slider m_sliderRenderDistance, m_sliderGamma, m_sliderFOV, m_sliderInterfaceOpacity; // Sliders
 	UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
 		UI_MAP_ELEMENT( m_checkboxClouds, "Clouds")
 		UI_MAP_ELEMENT( m_checkboxBedrockFog, "BedrockFog")
 		UI_MAP_ELEMENT( m_checkboxCustomSkinAnim, "CustomSkinAnim")
+		UI_MAP_ELEMENT( m_sliderRenderDistance, "RenderDistance")
 		UI_MAP_ELEMENT( m_sliderGamma, "Gamma")
 		UI_MAP_ELEMENT(m_sliderFOV, "FOV")
 		UI_MAP_ELEMENT( m_sliderInterfaceOpacity, "InterfaceOpacity")
@@ -45,4 +49,8 @@ public:
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
 
 	virtual void handleSliderMove(F64 sliderId, F64 currentValue);
+
+	static int LevelToDistance(int dist);
+
+	static int DistanceToLevel(int dist);
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
index 39a0b7c6..2ae9c897 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
@@ -8,7 +8,7 @@ UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *pa
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_buttons[BUTTON_ALL_OPTIONS].init(IDS_OPTIONS,BUTTON_ALL_OPTIONS);
 	m_buttons[BUTTON_ALL_AUDIO].init(IDS_AUDIO,BUTTON_ALL_AUDIO);
@@ -51,7 +51,7 @@ wstring UIScene_SettingsMenu::getMoviePath()
 
 void UIScene_SettingsMenu::handleReload()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(ProfileManager.GetPrimaryPad()!=m_iPad)
 	{
 		removeControl( &m_buttons[BUTTON_ALL_AUDIO], bNotInGame);
@@ -68,7 +68,7 @@ void UIScene_SettingsMenu::updateTooltips()
 
 void UIScene_SettingsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -119,7 +119,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case BUTTON_ALL_OPTIONS:
 		ui.NavigateToScene(m_iPad, eUIScene_SettingsOptionsMenu);
@@ -151,7 +151,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
 
 int UIScene_SettingsMenu::ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_SettingsMenu* pClass = (UIScene_SettingsMenu*)pParam;
+	UIScene_SettingsMenu* pClass = static_cast<UIScene_SettingsMenu *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp
index 6898d489..7b4d3d9d 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp
@@ -29,7 +29,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, void *initDat
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_checkboxViewBob.init(IDS_VIEW_BOBBING,eControl_ViewBob,(app.GetGameSettings(m_iPad,eGameSetting_ViewBob)!=0));
 	m_checkboxShowHints.init(IDS_HINTS,eControl_ShowHints,(app.GetGameSettings(m_iPad,eGameSetting_Hints)!=0));
@@ -99,7 +99,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, void *initDat
 	bool bRemoveAutosave=false;
 	bool bRemoveInGameGamertags=false;
 	
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 	if(!bPrimaryPlayer)
 	{
@@ -196,7 +196,7 @@ void UIScene_SettingsOptionsMenu::updateTooltips()
 
 void UIScene_SettingsOptionsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -243,7 +243,7 @@ void UIScene_SettingsOptionsMenu::handlePress(F64 controlId, F64 childId)
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Languages:
 		m_bNavigateToLanguageSelector = true;
@@ -324,7 +324,7 @@ void UIScene_SettingsOptionsMenu::handleReload()
 	bool bRemoveAutosave=false;
 	bool bRemoveInGameGamertags=false;
 	
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 	if(!bPrimaryPlayer)
 	{
@@ -378,8 +378,8 @@ void UIScene_SettingsOptionsMenu::handleReload()
 
 void UIScene_SettingsOptionsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Autosave:
 		m_sliderAutosave.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
index 917012d6..873564f6 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
@@ -7,7 +7,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_checkboxDisplayHUD.init(app.GetString(IDS_CHECKBOX_DISPLAY_HUD),eControl_DisplayHUD,(app.GetGameSettings(m_iPad,eGameSetting_DisplayHUD)!=0));
 	m_checkboxDisplayHand.init(app.GetString(IDS_CHECKBOX_DISPLAY_HAND),eControl_DisplayHand,(app.GetGameSettings(m_iPad,eGameSetting_DisplayHand)!=0));
@@ -26,7 +26,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
 
 	doHorizontalResizeCheck();
 
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
+	bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 
 	// if we're not in the game, we need to use basescene 0 
@@ -57,7 +57,7 @@ void UIScene_SettingsUIMenu::updateTooltips()
 
 void UIScene_SettingsUIMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -146,8 +146,8 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
 void UIScene_SettingsUIMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_UISize:
 		m_sliderUISize.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
index c29bac2d..5ef783d3 100644
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
@@ -13,11 +13,17 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	SignEntryScreenInput* initData = (SignEntryScreenInput*)_initData;
+	SignEntryScreenInput* initData = static_cast<SignEntryScreenInput *>(_initData);
 	m_sign = initData->sign;
 
 	m_bConfirmed = false;
 	m_bIgnoreInput = false;
+	m_iSignCursorFrame = 0;
+#ifdef _WINDOWS64
+	m_iActiveDirectEditLine = -1;
+	m_bNeedsInitialEdit = true;
+	m_bSkipTickNav = false;
+#endif
 
 	m_buttonConfirm.init(app.GetString(IDS_DONE), eControl_Confirm);
 	m_labelMessage.init(app.GetString(IDS_EDIT_SIGN_MESSAGE));
@@ -53,6 +59,7 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer
 
 UIScene_SignEntryMenu::~UIScene_SignEntryMenu()
 {
+	m_sign->SetSelectedLine(-1);
 	m_parentLayer->removeComponent(eUIComponent_MenuBackground);
 }
 
@@ -77,6 +84,79 @@ void UIScene_SignEntryMenu::tick()
 {
 	UIScene::tick();
 
+#ifdef _WINDOWS64
+	// On first tick, auto-start editing line 1 if KBM is active (Java-style flow)
+	if (m_bNeedsInitialEdit)
+	{
+		m_bNeedsInitialEdit = false;
+		if (g_KBMInput.IsKBMActive())
+		{
+			SetFocusToElement(eControl_Line1);
+			m_iActiveDirectEditLine = 0;
+			m_textInputLines[0].beginDirectEdit(15);
+		}
+	}
+
+	// UP/DOWN navigation — must happen after tickDirectEdit (so typed chars are consumed)
+	// and before sign cursor update (so the cursor is correct for this frame's render)
+	// m_bSkipTickNav prevents double-processing when handleInput auto-started editing this frame
+	if (m_iActiveDirectEditLine >= 0 && !m_bSkipTickNav)
+	{
+		int navDir = 0;
+		if (g_KBMInput.IsKeyPressed(VK_DOWN)) navDir = 1;
+		else if (g_KBMInput.IsKeyPressed(VK_UP)) navDir = -1;
+
+		if (navDir != 0)
+		{
+			int newLine = m_iActiveDirectEditLine + navDir;
+			if (newLine >= eControl_Line1 && newLine <= eControl_Line4)
+			{
+				m_textInputLines[m_iActiveDirectEditLine].confirmDirectEdit();
+				SetFocusToElement(newLine);
+				m_iActiveDirectEditLine = newLine;
+				m_textInputLines[newLine].beginDirectEdit(15);
+			}
+			else if (navDir > 0)
+			{
+				m_textInputLines[m_iActiveDirectEditLine].confirmDirectEdit();
+				SetFocusToElement(eControl_Confirm);
+				m_iActiveDirectEditLine = -1;
+			}
+		}
+	}
+	m_bSkipTickNav = false;
+
+	if (m_iActiveDirectEditLine >= 0 && !m_textInputLines[m_iActiveDirectEditLine].isDirectEditing())
+		m_iActiveDirectEditLine = -1;
+#endif
+
+	// Blinking > text < cursor on the 3D sign
+	m_iSignCursorFrame++;
+	if (m_iSignCursorFrame / 6 % 2 == 0)
+	{
+#ifdef _WINDOWS64
+		if (m_iActiveDirectEditLine >= 0)
+			m_sign->SetSelectedLine(m_iActiveDirectEditLine);
+		else
+#endif
+		{
+			int focusedLine = -1;
+			for (int i = eControl_Line1; i <= eControl_Line4; i++)
+			{
+				if (controlHasFocus(i))
+				{
+					focusedLine = i;
+					break;
+				}
+			}
+			m_sign->SetSelectedLine(focusedLine);
+		}
+	}
+	else
+	{
+		m_sign->SetSelectedLine(-1);
+	}
+
 	if(m_bConfirmed)
 	{
 		m_bConfirmed = false;
@@ -95,9 +175,9 @@ void UIScene_SignEntryMenu::tick()
 		if (pMinecraft->level->isClientSide)
 		{
 			shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
-			if(player != NULL && player->connection && player->connection->isStarted())
+			if(player != nullptr && player->connection && player->connection->isStarted())
 			{
-				player->connection->send( shared_ptr<SignUpdatePacket>( new SignUpdatePacket(m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), m_sign->IsCensored(), m_sign->GetMessages()) ) );
+				player->connection->send(std::make_shared<SignUpdatePacket>(m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), m_sign->IsCensored(), m_sign->GetMessages()));
 			}
 		}
 		ui.CloseUIScenes(m_iPad);
@@ -107,6 +187,9 @@ void UIScene_SignEntryMenu::tick()
 void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if(m_bConfirmed || m_bIgnoreInput) return;
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) { handled = true; return; }
+#endif
 
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
@@ -132,32 +215,125 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pre
 #ifdef __ORBIS__
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
+		sendInputToMovie(key, repeat, pressed, released);
+		handled = true;
+		break;
 	case ACTION_MENU_UP:
 	case ACTION_MENU_DOWN:
 		sendInputToMovie(key, repeat, pressed, released);
+#ifdef _WINDOWS64
+		// Auto-start editing if focus moved to a line (e.g. UP from Confirm)
+		if (g_KBMInput.IsKBMActive())
+		{
+			for (int i = eControl_Line1; i <= eControl_Line4; i++)
+			{
+				if (controlHasFocus(i))
+				{
+					m_iActiveDirectEditLine = i;
+					m_textInputLines[i].beginDirectEdit(15);
+					m_bSkipTickNav = true;
+					break;
+				}
+			}
+		}
+#endif
 		handled = true;
 		break;
 	}
 }
 
+#ifdef _WINDOWS64
+void UIScene_SignEntryMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	for (int i = 0; i < 4; i++)
+		inputs.push_back(&m_textInputLines[i]);
+}
+
+void UIScene_SignEntryMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	int line = -1;
+	for (int i = 0; i < 4; i++)
+	{
+		if (input == &m_textInputLines[i]) { line = i; break; }
+	}
+	if (line != m_iActiveDirectEditLine) return;
+
+	if (result == UIControl_TextInput::eDirectEdit_Confirmed)
+	{
+		int newLine = line + 1;
+		if (newLine <= eControl_Line4)
+		{
+			SetFocusToElement(newLine);
+			m_iActiveDirectEditLine = newLine;
+			m_textInputLines[newLine].beginDirectEdit(15);
+		}
+		else
+		{
+			m_iActiveDirectEditLine = -1;
+			m_bConfirmed = true;
+		}
+	}
+	else if (result == UIControl_TextInput::eDirectEdit_Cancelled)
+	{
+		m_iActiveDirectEditLine = -1;
+		wstring temp = L"";
+		for (int j = 0; j < 4; j++)
+			m_sign->SetMessage(j, temp);
+		navigateBack();
+		ui.PlayUISFX(eSFX_Back);
+	}
+}
+
+bool UIScene_SignEntryMenu::handleMouseClick(F32 x, F32 y)
+{
+	if (m_iActiveDirectEditLine >= 0)
+	{
+		// During direct edit, only the Done button is clickable.
+		// Hit-test it manually — all other clicks are consumed but ignored.
+		m_buttonConfirm.UpdateControl();
+		S32 cx = m_buttonConfirm.getXPos();
+		S32 cy = m_buttonConfirm.getYPos();
+		S32 cw = m_buttonConfirm.getWidth();
+		S32 ch = m_buttonConfirm.getHeight();
+		if (cw > 0 && ch > 0 && x >= cx && x <= cx + cw && y >= cy && y <= cy + ch)
+		{
+			m_textInputLines[m_iActiveDirectEditLine].confirmDirectEdit();
+			m_iActiveDirectEditLine = -1;
+			m_bConfirmed = true;
+		}
+		return true;
+	}
+	return UIScene::handleMouseClick(x, y);
+}
+#endif
+
 int UIScene_SignEntryMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	// 4J HEG - No reason to set value if keyboard was cancelled
-	UIScene_SignEntryMenu *pClass=(UIScene_SignEntryMenu *)lpParam;
+	const auto pClass=static_cast<UIScene_SignEntryMenu *>(lpParam);
 	pClass->m_bIgnoreInput = false;
 	if (bRes)
 	{
+#ifdef _WINDOWS64
+		uint16_t pchText[128];
+		ZeroMemory(pchText, 128 * sizeof(uint16_t));
+		Win64_GetKeyboardText(pchText, 128);
+		pClass->m_textInputLines[pClass->m_iEditingLine].setLabel(reinterpret_cast<wchar_t *>(pchText));
+#else
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 		InputManager.GetText(pchText);
 		pClass->m_textInputLines[pClass->m_iEditingLine].setLabel((wchar_t *)pchText);
+#endif
 	}
 	return 0;
 }
 
 void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		{
@@ -169,7 +345,29 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId)
 	case eControl_Line3:
 	case eControl_Line4:
 		{
-			m_iEditingLine = (int)controlId;
+			m_iEditingLine = static_cast<int>(controlId);
+#ifdef _WINDOWS64
+			if (g_KBMInput.IsKBMActive())
+			{
+				// Only start editing from keyboard (Enter on focused line), not mouse clicks
+				if (!g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_LEFT))
+				{
+					m_iActiveDirectEditLine = m_iEditingLine;
+					m_textInputLines[m_iEditingLine].beginDirectEdit(15);
+				}
+			}
+			else
+			{
+				m_bIgnoreInput = true;
+				UIKeyboardInitData kbData;
+				kbData.title       = app.GetString(IDS_SIGN_TITLE);
+				kbData.defaultText = m_textInputLines[m_iEditingLine].getLabel();
+				kbData.maxChars    = 15;
+				kbData.callback    = &UIScene_SignEntryMenu::KeyboardCompleteCallback;
+				kbData.lpParam     = this;
+				ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+			}
+#else
 			m_bIgnoreInput = true;
 #ifdef _XBOX_ONE
 			// 4J-PB - Xbox One uses the Windows virtual keyboard, and doesn't have the Xbox 360 Latin keyboard type, so we can't restrict the input set to alphanumeric. The closest we get is the emailSmtpAddress type.
@@ -186,7 +384,8 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId)
 				break;
 			}
 #else
-			InputManager.RequestKeyboard(app.GetString(IDS_SIGN_TITLE),m_textInputLines[m_iEditingLine].getLabel(),(DWORD)m_iPad,15,&UIScene_SignEntryMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Alphabet);
+			InputManager.RequestKeyboard(app.GetString(IDS_SIGN_TITLE),m_textInputLines[m_iEditingLine].getLabel(),static_cast<DWORD>(m_iPad),15,&UIScene_SignEntryMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Alphabet);
+#endif
 #endif
 		}
 		break;
diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h
index 28b37d53..4e1c2a5b 100644
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h
@@ -21,6 +21,12 @@ private:
 	int m_iEditingLine;
 	bool m_bConfirmed;
 	bool m_bIgnoreInput;
+	int m_iSignCursorFrame;
+#ifdef _WINDOWS64
+	int m_iActiveDirectEditLine;
+	bool m_bNeedsInitialEdit;
+	bool m_bSkipTickNav;
+#endif
 
 	UIControl_Button m_buttonConfirm;
 	UIControl_Label m_labelMessage;
@@ -50,6 +56,11 @@ protected:
 public:
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
 
 protected:
 	void handlePress(F64 controlId, F64 childId);
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
index d4f26ae7..a3482a24 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
@@ -13,7 +13,7 @@
 //#define SKIN_SELECT_PACK_PLAYER_CUSTOM 1
 #define SKIN_SELECT_MAX_DEFAULTS 2
 
-WCHAR *UIScene_SkinSelectMenu::wchDefaultNamesA[]=
+const WCHAR *UIScene_SkinSelectMenu::wchDefaultNamesA[]=
 {
 	L"USE LOCALISED VERSION", // Server selected
 	L"Steve",
@@ -40,7 +40,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
 	m_bIgnoreInput=false;
 	m_bNoSkinsToShow = false;
 	
-	m_currentPack = NULL;
+	m_currentPack = nullptr;
 	m_packIndex = SKIN_SELECT_PACK_DEFAULT;
 	m_skinIndex = 0;
 
@@ -48,7 +48,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
 	m_currentSkinPath = app.GetPlayerSkinName(iPad);
 	m_selectedSkinPath = L"";
 	m_selectedCapePath = L"";
-	m_vAdditionalSkinBoxes = NULL;
+	m_vAdditionalSkinBoxes = nullptr;
 
 	m_bSlidingSkins = false;
 	m_bAnimatingMove = false;
@@ -107,7 +107,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
 			// Change to display the favorites if there are any. The current skin will be in there (probably) - need to check for it
 			m_currentPack = app.m_dlcManager.getPackContainingSkin(m_currentSkinPath);
 			bool bFound;
-			if(m_currentPack != NULL)
+			if(m_currentPack != nullptr)
 			{
 				m_packIndex = app.m_dlcManager.getPackIndex(m_currentPack,bFound,DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
 			}
@@ -436,7 +436,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 }
 		break;
 	default:
-		if( m_currentPack != NULL )
+		if( m_currentPack != nullptr )
 		{
 			bool renableInputAfterOperation = true;
 			m_bIgnoreInput = true;
@@ -520,7 +520,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 						DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_currentPack->getPurchaseOfferId());
 						ULONGLONG ullOfferID_Full;
 
-						if(pDLCInfo!=NULL)
+						if(pDLCInfo!=nullptr)
 						{
 							ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 						}
@@ -534,7 +534,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 #endif
 						bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-						ProfileManager.GetChatAndContentRestrictions(m_iPad,true,NULL,&bContentRestricted,NULL);
+						ProfileManager.GetChatAndContentRestrictions(m_iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 						if(bContentRestricted)
 						{
@@ -599,7 +599,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	int characterId = -1;
-	swscanf((wchar_t*)region->name,L"Character%d",&characterId);
+	swscanf(static_cast<wchar_t *>(region->name),L"Character%d",&characterId);
 	if (characterId == -1)
 	{
 		app.DebugPrintf("Invalid character to render found\n");
@@ -635,8 +635,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	wstring skinOrigin = L"";
 	bool bSkinIsFree=false;
 	bool bLicensed=false;
-	DLCSkinFile *skinFile=NULL;
-	DLCPack *Pack=NULL;
+	DLCSkinFile *skinFile=nullptr;
+	DLCPack *Pack=nullptr;
 	BYTE sidePreviewControlsL,sidePreviewControlsR;
 	m_bNoSkinsToShow=false;
 
@@ -646,7 +646,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 
 	m_controlSkinNamePlate.setVisible( false );
 
-	if( m_currentPack != NULL )
+	if( m_currentPack != nullptr )
 	{
 		skinFile = m_currentPack->getSkinFile(m_skinIndex);
 		m_selectedSkinPath = skinFile->getPath();
@@ -673,7 +673,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	{	
 		m_selectedSkinPath = L"";
 		m_selectedCapePath = L"";
-		m_vAdditionalSkinBoxes = NULL;
+		m_vAdditionalSkinBoxes = nullptr;
 
 		switch(m_packIndex)
 		{
@@ -758,13 +758,13 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 		// add the boxes to the humanoid model, but only if we've not done this already
 
 		vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-		if(pAdditionalModelParts==NULL)
+		if(pAdditionalModelParts==nullptr)
 		{
 			pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),m_vAdditionalSkinBoxes);
 		}
 	}
 
-	if(skinFile!=NULL)
+	if(skinFile!=nullptr)
 	{
 		app.SetAnimOverrideBitmask(skinFile->getSkinID(),skinFile->getAnimOverrideBitmask());
 	}
@@ -779,7 +779,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 
 	wstring otherSkinPath = L"";
 	wstring otherCapePath = L"";
-	vector<SKIN_BOX *> *othervAdditionalSkinBoxes=NULL;
+	vector<SKIN_BOX *> *othervAdditionalSkinBoxes=nullptr;
 	wchar_t chars[256];
 
 	// turn off all displays
@@ -824,11 +824,11 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	{
 		if(showNext)
 		{
-			skinFile=NULL;
+			skinFile=nullptr;
 
 			m_characters[eCharacter_Next1 + i].setVisible(true);
 
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				skinFile = m_currentPack->getSkinFile(nextIndex);
 				otherSkinPath = skinFile->getPath();
@@ -840,7 +840,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			{	
 				otherSkinPath = L"";
 				otherCapePath = L"";
-				othervAdditionalSkinBoxes=NULL;
+				othervAdditionalSkinBoxes=nullptr;
 				switch(m_packIndex)
 				{
 				case SKIN_SELECT_PACK_DEFAULT:
@@ -872,13 +872,13 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
 			{
 				vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-				if(pAdditionalModelParts==NULL)
+				if(pAdditionalModelParts==nullptr)
 				{
 					pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
 				}
 			}
 			// 4J-PB - anim override needs set before SetTexture
-			if(skinFile!=NULL)
+			if(skinFile!=nullptr)
 			{
 				app.SetAnimOverrideBitmask(skinFile->getSkinID(),skinFile->getAnimOverrideBitmask());
 			}
@@ -895,11 +895,11 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	{
 		if(showPrevious)
 		{
-			skinFile=NULL;
+			skinFile=nullptr;
 			
 			m_characters[eCharacter_Previous1 + i].setVisible(true);
 
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				skinFile = m_currentPack->getSkinFile(previousIndex);
 				otherSkinPath = skinFile->getPath();
@@ -911,7 +911,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			{	
 				otherSkinPath = L"";
 				otherCapePath = L"";
-				othervAdditionalSkinBoxes=NULL;
+				othervAdditionalSkinBoxes=nullptr;
 				switch(m_packIndex)
 				{
 				case SKIN_SELECT_PACK_DEFAULT:
@@ -943,7 +943,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
 			{
 				vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-				if(pAdditionalModelParts==NULL)
+				if(pAdditionalModelParts==nullptr)
 				{
 					pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
 				}
@@ -1021,7 +1021,7 @@ int UIScene_SkinSelectMenu::getNextSkinIndex(DWORD sourceIndex)
 		{
 			nextSkin = eDefaultSkins_ServerSelected;
 		}
-		else if(m_currentPack != NULL && nextSkin>=m_currentPack->getSkinCount())
+		else if(m_currentPack != nullptr && nextSkin>=m_currentPack->getSkinCount())
 		{
 			nextSkin = 0;
 		}		
@@ -1055,7 +1055,7 @@ int UIScene_SkinSelectMenu::getPreviousSkinIndex(DWORD sourceIndex)
 			{
 				previousSkin = eDefaultSkins_Count - 1;
 			}
-			else if(m_currentPack != NULL)
+			else if(m_currentPack != nullptr)
 			{
 				previousSkin = m_currentPack->getSkinCount()-1;
 			}
@@ -1079,10 +1079,10 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 	}
 	else
 	{
-		m_currentPack = NULL;
+		m_currentPack = nullptr;
 	}
 	m_skinIndex = 0;
-	if(m_currentPack != NULL)
+	if(m_currentPack != nullptr)
 	{
 		bool found;
 		DWORD currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found);
@@ -1099,7 +1099,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 				DWORD defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
 				if( ugcSkinIndex == 0 )
 				{
-					m_skinIndex = (EDefaultSkins) defaultSkinIndex;
+					m_skinIndex = static_cast<EDefaultSkins>(defaultSkinIndex);
 				}
 			}	
 			break;
@@ -1130,7 +1130,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 std::wstring fakeWideToRealWide(const wchar_t* original)
 {
 	const char* name = reinterpret_cast<const char*>(original);
-	int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
+	int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, nullptr, 0);
 	std::wstring wName(len, 0);
 	MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
 	return wName.c_str();
@@ -1500,7 +1500,7 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete()
 	if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)>0)
 	{
 		m_currentPack = app.m_dlcManager.getPackContainingSkin(m_currentSkinPath);
-		if(m_currentPack != NULL)
+		if(m_currentPack != nullptr)
 		{
 			bool bFound = false;
 			m_packIndex = app.m_dlcManager.getPackIndex(m_currentPack,bFound,DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
@@ -1520,7 +1520,7 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete()
 
 	m_bIgnoreInput=false;
 	app.m_dlcManager.checkForCorruptDLCAndAlert();
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
+	bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
 
 #if TO_BE_IMPLEMENTED
 	if(bInGame) XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);
@@ -1534,7 +1534,7 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 {
 	// need to be signed in to live. get them to sign in to online
 #if defined(__PS3__)
-	SQRNetworkManager_PS3::AttemptPSNSignIn(NULL, this);		
+	SQRNetworkManager_PS3::AttemptPSNSignIn(nullptr, this);		
 
 #elif defined(__PSVITA__)
 	if(CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())
@@ -1543,15 +1543,15 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
 		uiIDA[1]=IDS_CANCEL;
-		ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_SkinSelectMenu::MustSignInReturned,NULL);
+		ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_SkinSelectMenu::MustSignInReturned,nullptr);
 	}
 	else
 	{
-		SQRNetworkManager_Vita::AttemptPSNSignIn(NULL, this);		
+		SQRNetworkManager_Vita::AttemptPSNSignIn(nullptr, this);		
 	}
 
 #elif defined(__ORBIS__)
-	SQRNetworkManager_Orbis::AttemptPSNSignIn(NULL, this, false, iPad);
+	SQRNetworkManager_Orbis::AttemptPSNSignIn(nullptr, this, false, iPad);
 
 #elif defined(_DURANGO)
 
@@ -1563,7 +1563,7 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 
 int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_SkinSelectMenu* pScene = (UIScene_SkinSelectMenu*)pParam;
+	UIScene_SkinSelectMenu* pScene = static_cast<UIScene_SkinSelectMenu *>(pParam);
 
 	if	(	(result == C4JStorage::EMessage_ResultAccept)
 		&&	ProfileManager.IsSignedIn(iPad)
@@ -1579,7 +1579,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 			const char *pchPackName=wstringtofilename(wStrPackName);
 			SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);
 
-			if (pSONYDLCInfo != NULL)
+			if (pSONYDLCInfo != nullptr)
 			{
 				char chName[42];
 				char chKeyName[20];
@@ -1593,7 +1593,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 				// while the store is screwed, hardcode the sku
 				//sprintf(chName,"%s-%s-%s",app.GetCommerceCategory(),pSONYDLCInfo->chDLCKeyname,"EURO");
 	
-				// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+				// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 				memset(chKeyName, 0, sizeof(chKeyName));
 				strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -1623,7 +1623,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 			// need to re-enable input because the user can back out of the store purchase, and we'll be stuck
 			pScene->m_bIgnoreInput = false;  // MGH - moved this to outside the pSONYDLCInfo, so we don't get stuck
 #elif defined _XBOX_ONE
-			StorageManager.InstallOffer(1,(WCHAR *)(pScene->m_currentPack->getPurchaseOfferId().c_str()), &RenableInput, pScene, NULL);
+			StorageManager.InstallOffer(1,(WCHAR *)(pScene->m_currentPack->getPurchaseOfferId().c_str()), &RenableInput, pScene, nullptr);
 #endif		
 		}
 		else // Is signed in, but not live.
@@ -1642,7 +1642,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 
 int UIScene_SkinSelectMenu::RenableInput(LPVOID lpVoid, int, int)
 {
-	((UIScene_SkinSelectMenu*) lpVoid)->m_bIgnoreInput = false;
+	static_cast<UIScene_SkinSelectMenu *>(lpVoid)->m_bIgnoreInput = false;
 	return 0;
 }
 
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
index e8d76096..60579ac6 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
@@ -6,7 +6,7 @@
 class UIScene_SkinSelectMenu : public UIScene
 {
 private:
-	static WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
+	static const WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
 
 	// 4J Stu - How many to show on each side of the main control
 	static const BYTE sidePreviewControls = 4;
diff --git a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
index f6916d13..017af93e 100644
--- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
@@ -12,7 +12,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	
-	TeleportMenuInitData *initParam = (TeleportMenuInitData *)initData;
+	TeleportMenuInitData *initParam = static_cast<TeleportMenuInitData *>(initData);
 
 	m_teleportToPlayer = initParam->teleportToPlayer;
 
@@ -41,7 +41,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
+		if( player != nullptr && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
 		{
 			m_players[m_playersCount] = player->GetSmallId();
 			++m_playersCount;
@@ -59,7 +59,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
 			}
 
 			int voiceStatus = 0;
-			if(player != NULL && player->HasVoice() )
+			if(player != nullptr && player->HasVoice() )
 			{
 				if( player->IsMutedByLocalUser(m_iPad) )
 				{
@@ -131,7 +131,7 @@ void UIScene_TeleportMenu::handleReload()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL && !(player->IsLocal() && player->GetUserIndex() == m_iPad)  )
+		if( player != nullptr && !(player->IsLocal() && player->GetUserIndex() == m_iPad)  )
 		{
 			m_players[m_playersCount] = player->GetSmallId();
 			++m_playersCount;
@@ -149,7 +149,7 @@ void UIScene_TeleportMenu::handleReload()
 			}
 
 			int voiceStatus = 0;
-			if(player != NULL && player->HasVoice() )
+			if(player != nullptr && player->HasVoice() )
 			{
 				if( player->IsMutedByLocalUser(m_iPad) )
 				{
@@ -189,7 +189,7 @@ void UIScene_TeleportMenu::tick()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId( m_players[i] );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			m_players[i] = player->GetSmallId();
 
@@ -250,11 +250,11 @@ void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, bool pres
 
 void UIScene_TeleportMenu::handlePress(F64 controlId, F64 childId)
 {
-	app.DebugPrintf("Pressed = %d, %d\n", (int)controlId, (int)childId);
-	switch((int)controlId)
+	app.DebugPrintf("Pressed = %d, %d\n", static_cast<int>(controlId), static_cast<int>(childId));
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamePlayers:
-		int currentSelection = (int)childId;
+		int currentSelection = static_cast<int>(childId);
 		INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId( m_players[ currentSelection ] );
 		INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(m_iPad);
 		
@@ -275,7 +275,7 @@ void UIScene_TeleportMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
-	UIScene_TeleportMenu *scene = (UIScene_TeleportMenu *)callbackParam;
+	UIScene_TeleportMenu *scene = static_cast<UIScene_TeleportMenu *>(callbackParam);
 	bool playerFound = false;
 	int foundIndex = 0;
 	for(int i = 0; i < scene->m_playersCount; ++i)
@@ -320,7 +320,7 @@ void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *
 		}
 
 		int voiceStatus = 0;
-		if(pPlayer != NULL && pPlayer->HasVoice() )
+		if(pPlayer != nullptr && pPlayer->HasVoice() )
 		{
 			if( pPlayer->IsMutedByLocalUser(scene->m_iPad) )
 			{
diff --git a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
index 0a35c8e5..bb9e30af 100644
--- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
@@ -25,13 +25,13 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *par
 	m_labelRequest1.init(L"");
 	m_labelRequest2.init(L"");
 
-	TradingScreenInput *initData = (TradingScreenInput *)_initData;
+	TradingScreenInput *initData = static_cast<TradingScreenInput *>(_initData);
 	m_merchant = initData->trader;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trading_Menu, this);
 	}
@@ -87,15 +87,15 @@ void UIScene_TradingMenu::handleDestroy()
 {
 	app.DebugPrintf("UIScene_TradingMenu::handleDestroy\n");
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(pMinecraft->localplayers[m_iPad] != NULL) pMinecraft->localplayers[m_iPad]->closeContainer();
+	if(pMinecraft->localplayers[m_iPad] != nullptr) pMinecraft->localplayers[m_iPad]->closeContainer();
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
@@ -155,11 +155,11 @@ void UIScene_TradingMenu::handleInput(int iPad, int key, bool repeat, bool press
 void UIScene_TradingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 
 	if(slotId < MerchantMenu::USE_ROW_SLOT_END)
 	{			
@@ -190,7 +190,7 @@ void UIScene_TradingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 			};
 		}
 	}
-	if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
+	if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
 }
 
 void UIScene_TradingMenu::showScrollRightArrow(bool show)
diff --git a/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp b/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp
index 9ef8f189..9338daba 100644
--- a/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp
@@ -50,7 +50,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, bool p
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
diff --git a/Minecraft.Client/Common/UI/UISplitScreenHelpers.h b/Minecraft.Client/Common/UI/UISplitScreenHelpers.h
new file mode 100644
index 00000000..e451b3f2
--- /dev/null
+++ b/Minecraft.Client/Common/UI/UISplitScreenHelpers.h
@@ -0,0 +1,114 @@
+#pragma once
+
+// Shared split-screen UI helpers to avoid duplicating viewport math
+// across HUD, Chat, Tooltips, and container menus.
+
+// Compute the raw viewport rectangle for a given viewport type.
+inline void GetViewportRect(F32 screenW, F32 screenH, C4JRender::eViewportType viewport,
+	F32 &originX, F32 &originY, F32 &viewW, F32 &viewH)
+{
+	originX = originY = 0;
+	viewW = screenW;
+	viewH = screenH;
+	switch(viewport)
+	{
+	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
+		viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
+		originY = screenH * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
+		viewW = screenW * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
+		originX = screenW * 0.5f; viewW = screenW * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
+		viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
+		originX = screenW * 0.5f; viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
+		originY = screenH * 0.5f; viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
+		originX = screenW * 0.5f; originY = screenH * 0.5f;
+		viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	default: break;
+	}
+}
+
+// Fit a 16:9 rectangle inside the given dimensions.
+inline void Fit16x9(F32 viewW, F32 viewH, S32 &fitW, S32 &fitH, S32 &offsetX, S32 &offsetY)
+{
+	const F32 kAspect = 16.0f / 9.0f;
+	if(viewW / viewH > kAspect)
+	{
+		fitH = (S32)viewH;
+		fitW = (S32)(viewH * kAspect);
+	}
+	else
+	{
+		fitW = (S32)viewW;
+		fitH = (S32)(viewW / kAspect);
+	}
+	offsetX = (S32)((viewW - fitW) * 0.5f);
+	offsetY = (S32)((viewH - fitH) * 0.5f);
+}
+
+// Convenience: just fit 16:9 dimensions, ignore offsets.
+inline void Fit16x9(S32 &width, S32 &height)
+{
+	S32 offX, offY;
+	Fit16x9((F32)width, (F32)height, width, height, offX, offY);
+}
+
+// Compute the uniform scale and tileYStart for split-screen tile rendering.
+// Used by HUD, Chat, and Tooltips to scale the SWF movie to cover the viewport tile.
+inline void ComputeTileScale(S32 tileWidth, S32 tileHeight, S32 movieWidth, S32 movieHeight,
+	bool needsYTile, F32 &outScale, S32 &outTileYStart)
+{
+	F32 scaleW = (F32)tileWidth / (F32)movieWidth;
+	F32 scaleH = (F32)tileHeight / (F32)movieHeight;
+	F32 scale = (scaleW > scaleH) ? scaleW : scaleH;
+	if(scale < 1.0f) scale = 1.0f;
+
+	outTileYStart = 0;
+	if(needsYTile)
+	{
+		S32 dispH = (S32)(movieHeight * scale);
+		outTileYStart = dispH - tileHeight;
+		if(outTileYStart < 0) outTileYStart = 0;
+		scaleH = (F32)(outTileYStart + tileHeight) / (F32)movieHeight;
+		scale = (scaleW > scaleH) ? scaleW : scaleH;
+		if(scale < 1.0f) scale = 1.0f;
+	}
+
+	outScale = scale;
+}
+
+// Compute the render offset to center split-screen SWF content in the viewport.
+// Used by Chat and Tooltips (HUD uses repositionHud instead).
+inline void ComputeSplitContentOffset(C4JRender::eViewportType viewport, S32 movieWidth, S32 movieHeight,
+	F32 scale, S32 tileWidth, S32 tileHeight, S32 tileYStart,
+	S32 &outXOffset, S32 &outYOffset)
+{
+	S32 contentCenterX, contentCenterY;
+	if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT || viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT)
+	{
+		contentCenterX = (S32)(movieWidth * scale / 4);
+		contentCenterY = (S32)(movieHeight * scale / 2);
+	}
+	else if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_TOP || viewport == C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM)
+	{
+		contentCenterX = (S32)(movieWidth * scale / 2);
+		contentCenterY = (S32)(movieHeight * scale * 3 / 4);
+	}
+	else
+	{
+		contentCenterX = (S32)(movieWidth * scale / 4);
+		contentCenterY = (S32)(movieHeight * scale * 3 / 4);
+	}
+
+	outXOffset = 0;
+	outYOffset = 0;
+	if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT)
+		outXOffset = -(tileWidth / 2 - contentCenterX);
+	if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_TOP || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT)
+		outYOffset = -(tileHeight / 2 - (contentCenterY - tileYStart));
+}
diff --git a/Minecraft.Client/Common/UI/UIString.cpp b/Minecraft.Client/Common/UI/UIString.cpp
index 288fa87a..04d8b8e3 100644
--- a/Minecraft.Client/Common/UI/UIString.cpp
+++ b/Minecraft.Client/Common/UI/UIString.cpp
@@ -139,7 +139,7 @@ UIString::~UIString()
 
 bool UIString::empty()
 {
-	return m_core.get() == NULL;
+	return m_core.get() == nullptr;
 }
 
 bool UIString::compare(const UIString &uiString)
@@ -149,19 +149,19 @@ bool UIString::compare(const UIString &uiString)
 
 bool UIString::needsUpdating()
 {
-	if (m_core != NULL)	return m_core->needsUpdating();
+	if (m_core != nullptr)	return m_core->needsUpdating();
 	else				return false;
 }
 
 void UIString::setUpdated()
 {
-	if (m_core != NULL)	m_core->setUpdated();
+	if (m_core != nullptr)	m_core->setUpdated();
 }
 
 wstring &UIString::getString()
 {
 	static wstring blank(L"");
-	if (m_core != NULL) return m_core->getString();
+	if (m_core != nullptr) return m_core->getString();
 	else				return blank;
 }
 
diff --git a/Minecraft.Client/Common/UI/UIStructs.h b/Minecraft.Client/Common/UI/UIStructs.h
index ac83458f..99c3d7bd 100644
--- a/Minecraft.Client/Common/UI/UIStructs.h
+++ b/Minecraft.Client/Common/UI/UIStructs.h
@@ -196,8 +196,8 @@ typedef struct _ConnectionProgressParams
 		showTooltips = false;
 		setFailTimer = false;
 		timerTime = 0;
-		cancelFunc = NULL;
-		cancelFuncParam = NULL;
+		cancelFunc = nullptr;
+		cancelFuncParam = nullptr;
 	}
 } ConnectionProgressParams;
 
@@ -250,7 +250,7 @@ typedef struct _SaveListDetails
 	_SaveListDetails()
 	{
 		saveId = 0;
-		pbThumbnailData = NULL;
+		pbThumbnailData = nullptr;
 		dwThumbnailSize = 0;
 #ifdef _DURANGO
 		ZeroMemory(UTF16SaveName,sizeof(wchar_t)*128);
@@ -280,6 +280,9 @@ typedef struct _JoinMenuInitData
 {
 	FriendSessionInfo *selectedSession;
 	int iPad;
+#ifdef _WINDOWS64
+	int serverIndex; // Index of the server in servers.db, -1 if not a saved server
+#endif
 } JoinMenuInitData;
 
 // Native keyboard (Windows64 replacement for InputManager.RequestKeyboard WinAPI dialog)
@@ -403,15 +406,15 @@ typedef struct _LoadingInputParams
 
 	_LoadingInputParams()
 	{
-		func = NULL;
-		lpParam = NULL;
-		completionData = NULL;
+		func = nullptr;
+		lpParam = nullptr;
+		completionData = nullptr;
 
 		cancelText = -1;
-		cancelFunc = NULL;
-		completeFunc = NULL;
-		m_cancelFuncParam = NULL;
-		m_completeFuncParam = NULL;
+		cancelFunc = nullptr;
+		completeFunc = nullptr;
+		m_cancelFuncParam = nullptr;
+		m_completeFuncParam = nullptr;
 		waitForThreadToDelete = false;
 	}
 } LoadingInputParams;
@@ -439,7 +442,7 @@ typedef struct _TutorialPopupInfo
 
 	_TutorialPopupInfo()
 	{
-		interactScene = NULL;
+		interactScene = nullptr;
 		desc = L"";
 		title = L"";
 		icon = -1;
@@ -447,7 +450,7 @@ typedef struct _TutorialPopupInfo
 		isFoil = false;
 		allowFade = true;
 		isReminder = false;
-		tutorial = NULL;
+		tutorial = nullptr;
 	}
 
 } TutorialPopupInfo;
diff --git a/Minecraft.Client/Common/UI/UITTFFont.cpp b/Minecraft.Client/Common/UI/UITTFFont.cpp
index 5d72ed97..359ac76b 100644
--- a/Minecraft.Client/Common/UI/UITTFFont.cpp
+++ b/Minecraft.Client/Common/UI/UITTFFont.cpp
@@ -11,9 +11,9 @@ UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharact
 
 #ifdef _UNICODE
 	wstring wPath = convStringToWstring(path);
-	HANDLE file = CreateFile(wPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(wPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #else
-	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #endif
 	if( file == INVALID_HANDLE_VALUE )
 	{
@@ -30,7 +30,7 @@ UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharact
 		DWORD bytesRead;
 
 		pbData =  (PBYTE) new BYTE[dwFileSize];
-		BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
+		BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,nullptr);
 		if(bSuccess==FALSE)
 		{
 			app.FatalLoadError();
diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
index 3e3faa77..64005621 100644
--- a/Minecraft.Client/Common/XUI/XUI_Chat.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
@@ -5,7 +5,7 @@
 
 HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 
@@ -37,7 +37,7 @@ HRESULT CScene_Chat::OnTimer( XUIMessageTimer *pXUIMessageTimer, BOOL &bHandled)
 			m_Labels[i].SetOpacity(0);
 		}
 	}
-	if(pMinecraft->localplayers[m_iPad]!= NULL)
+	if(pMinecraft->localplayers[m_iPad]!= nullptr)
 	{
 		m_Jukebox.SetText( pGui->getJukeboxMessage(m_iPad).c_str() );
 		m_Jukebox.SetOpacity( pGui->getJukeboxOpacity(m_iPad) );
diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
index 9a82a7b3..5ae736a3 100644
--- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
@@ -12,7 +12,7 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_ConnectingProgress::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	ConnectionProgressParams *param = (ConnectionProgressParams *)pInitData->pvInitData;
+	ConnectionProgressParams *param = static_cast<ConnectionProgressParams *>(pInitData->pvInitData);
 	m_iPad = param->iPad;
 	MapChildControls();
 
@@ -203,7 +203,7 @@ HRESULT CScene_ConnectingProgress::OnTimer( XUIMessageTimer *pTimer, BOOL& bHand
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
 #ifdef _XBOX
-			StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+			StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 #endif
 			exitReasonStringId = -1;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.cpp
index cc3afeca..576b7557 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.cpp
@@ -10,7 +10,7 @@ HRESULT CXuiCtrl4JEdit::OnInit(XUIMessageInit* pInitData, BOOL& rfHandled)
 	// set a limit for the text box
 	m_uTextLimit=XUI_4JEDIT_MAX_CHARS-1;
 	XuiEditSetTextLimit(m_hObj,m_uTextLimit);
-	//  Find the text limit. (Add one for NULL terminator)
+	//  Find the text limit. (Add one for nullptr terminator)
 	//m_uTextLimit = min( XuiEditGetTextLimit(m_hObj) + 1, XUI_4JEDIT_MAX_CHARS);
 
 	ZeroMemory( wchText , sizeof(WCHAR)*(m_uTextLimit+1) );
@@ -127,7 +127,7 @@ HRESULT CXuiCtrl4JEdit::OnChar(XUIMessageChar* pInputData, BOOL& rfHandled)
 	XuiSendMessage( hBaseObj, &xuiMsg );
 
  	rfHandled = TRUE;
- 	SendNotifyValueChanged((int)pInputData->wch);
+ 	SendNotifyValueChanged(static_cast<int>(pInputData->wch));
 
 	return hr;
 }    
@@ -145,7 +145,7 @@ HRESULT CXuiCtrl4JEdit::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 
 	if( pThis->m_bReadOnly ) return hr;
 
-	//  Find the text limit. (Add one for NULL terminator)
+	//  Find the text limit. (Add one for nullptr terminator)
 	//m_uTextLimit = min( XuiEditGetTextLimit(m_hObj) + 1, XUI_4JEDIT_MAX_CHARS);
 
 	if((((pInputData->dwKeyCode == VK_PAD_A) && (pInputData->wch == 0)) || (pInputData->dwKeyCode == VK_PAD_START)) && !(pInputData->dwFlags & XUI_INPUT_FLAG_REPEAT))
@@ -185,14 +185,14 @@ HRESULT CXuiCtrl4JEdit::SendNotifyValueChanged(int iValue)
 
 int CXuiCtrl4JEdit::KeyboardReturned(void *pParam,bool bSet)
 {
-	CXuiCtrl4JEdit* pClass = (CXuiCtrl4JEdit*)pParam;
+	CXuiCtrl4JEdit* pClass = static_cast<CXuiCtrl4JEdit *>(pParam);
 	HRESULT hr = S_OK;
 
 	if(bSet)
 	{
 		pClass->SetText(pClass->wchText);
 		// need to move the caret to the end of the newly set text
-		XuiEditSetCaretPosition(pClass->m_hObj, (int)wcsnlen(pClass->wchText, 50));
+		XuiEditSetCaretPosition(pClass->m_hObj, static_cast<int>(wcsnlen(pClass->wchText, 50)));
 		pClass->SendNotifyValueChanged(10); // 10 for a return
 	}
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JIcon.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JIcon.cpp
index 8895b60e..a4ff8d37 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JIcon.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JIcon.cpp
@@ -3,7 +3,7 @@
 
 HRESULT CXuiCtrl4JIcon::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
 {
-	m_hBrush=NULL;
+	m_hBrush=nullptr;
 	return S_OK;
 }
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
index 4c615979..7523c523 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
@@ -7,7 +7,7 @@ HRESULT CXuiCtrl4JList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
 {
 	InitializeCriticalSection(&m_AccessListData);
 
-	m_hSelectionChangedHandlerObj = NULL;
+	m_hSelectionChangedHandlerObj = nullptr;
 
 	return S_OK;
 }
@@ -22,13 +22,13 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
 
 	if(ItemInfo.pwszText)
 	{
-		dwLen1=(int)wcslen(ItemInfo.pwszText)*sizeof(WCHAR);
+		dwLen1=static_cast<int>(wcslen(ItemInfo.pwszText))*sizeof(WCHAR);
 		dwBytes+=dwLen1+sizeof(WCHAR);
 	}
 
 	if(ItemInfo.pwszImage)
 	{
-		dwLen2=(int)(wcslen(ItemInfo.pwszImage))*sizeof(WCHAR);
+		dwLen2=static_cast<int>(wcslen(ItemInfo.pwszImage))*sizeof(WCHAR);
 		dwBytes+=dwLen2+sizeof(WCHAR);
 	}
 
@@ -59,11 +59,11 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
 	// need to remember the original index of this addition before it gets sorted - this will get used to load the game
 	if(iSortListFromIndex!=-1)
 	{
-		pItemInfo->iIndex=(int)m_vListData.size()-iSortListFromIndex;
+		pItemInfo->iIndex=static_cast<int>(m_vListData.size())-iSortListFromIndex;
 	}
 	else
 	{
-		pItemInfo->iIndex=(int)m_vListData.size();
+		pItemInfo->iIndex=static_cast<int>(m_vListData.size());
 	}
 
 	// added to force a sort order for DLC
@@ -110,7 +110,7 @@ void CXuiCtrl4JList::RemoveAllData( )
 {
 	EnterCriticalSection(&m_AccessListData);
 
-	int iSize=(int)m_vListData.size();
+	int iSize=static_cast<int>(m_vListData.size());
 	for(int i=0;i<iSize;i++)
 	{
 		LIST_ITEM_INFO *pBack = m_vListData.back();
@@ -304,7 +304,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceT
 
 HRESULT CXuiCtrl4JList::OnGetItemCountAll(XUIMessageGetItemCount *pGetItemCountData,BOOL& bHandled)
 {
-	pGetItemCountData->cItems = (int)m_vListData.size();
+	pGetItemCountData->cItems = static_cast<int>(m_vListData.size());
 	bHandled = TRUE;
 	return S_OK;
 }
@@ -315,7 +315,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourc
 	{
 		// Check for a brush
 		EnterCriticalSection(&m_AccessListData);
-		if(GetData(pGetSourceImageData->iItem).hXuiBrush!=NULL)
+		if(GetData(pGetSourceImageData->iItem).hXuiBrush!=nullptr)
 		{
 			pGetSourceImageData->hBrush=GetData(pGetSourceImageData->iItem).hXuiBrush;
 		}
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
index 074b7300..e74b92b4 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
@@ -10,9 +10,9 @@ int CXuiCtrlBrewProgress::GetValue()
 	void* pvUserData;
 	this->GetUserData( &pvUserData );
 
-	if( pvUserData != NULL )
+	if( pvUserData != nullptr )
 	{
-		BrewingStandTileEntity *pBrewingStandTileEntity = (BrewingStandTileEntity *)pvUserData;
+		BrewingStandTileEntity *pBrewingStandTileEntity = static_cast<BrewingStandTileEntity *>(pvUserData);
 
 		return pBrewingStandTileEntity->getBrewTime();
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
index cc5d996f..48a130c4 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
@@ -8,9 +8,9 @@ int CXuiCtrlBubblesProgress::GetValue()
 	void* pvUserData;
 	this->GetUserData( &pvUserData );
 
-	if( pvUserData != NULL )
+	if( pvUserData != nullptr )
 	{
-		BrewingStandTileEntity *pBrewingStandTileEntity = (BrewingStandTileEntity *)pvUserData;
+		BrewingStandTileEntity *pBrewingStandTileEntity = static_cast<BrewingStandTileEntity *>(pvUserData);
 
 		int value = 0;
 		int bubbleStep = (pBrewingStandTileEntity->getBrewTime() / 2) % 7;
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
index 8e514094..5a1a3674 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
@@ -10,9 +10,9 @@ int CXuiCtrlBurnProgress::GetValue()
 	void* pvUserData;
 	this->GetUserData( &pvUserData );
 
-	if( pvUserData != NULL )
+	if( pvUserData != nullptr )
 	{
-		FurnaceTileEntity *pFurnaceTileEntity = (FurnaceTileEntity *)pvUserData;
+		FurnaceTileEntity *pFurnaceTileEntity = static_cast<FurnaceTileEntity *>(pvUserData);
 
 		// TODO This param is a magic number in Java but we should really define it somewhere with a name
 		// I think it is the number of states of the progress display (ie the max value)
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
index 82b6c3ed..46bcc983 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
@@ -11,7 +11,7 @@
 CXuiCtrlCraftIngredientSlot::CXuiCtrlCraftIngredientSlot() 
 {
 	m_iID=0;
-	m_Desc=NULL;
+	m_Desc=nullptr;
 	m_isFoil = false;
 	m_isDirty = false;
 	m_item = nullptr;
@@ -29,7 +29,7 @@ HRESULT CXuiCtrlCraftIngredientSlot::OnInit(XUIMessageInit* pInitData, BOOL& rfH
 //-----------------------------------------------------------------------------
 HRESULT CXuiCtrlCraftIngredientSlot::OnCustomMessage_GetSlotItem(CustomMessage_GetSlotItem_Struct *pData, BOOL& bHandled)
 {
-	if( m_iID != 0 || m_item != NULL )
+	if( m_iID != 0 || m_item != nullptr )
 	{
 		pData->item = m_item;
 		pData->iItemBitField = MAKE_SLOTDISPLAY_ITEM_BITMASK(m_iID,m_iAuxVal,m_isFoil);
@@ -94,7 +94,7 @@ void CXuiCtrlCraftIngredientSlot::SetIcon(int iPad, int iId,int iAuxVal, int iCo
 
 void CXuiCtrlCraftIngredientSlot::SetIcon(int iPad, shared_ptr<ItemInstance> item, int iScale, unsigned int uiAlpha,bool bDecorations, BOOL bShow)
 {
-	if(item == NULL) SetIcon(iPad, 0,0,0,0,0,false,false,bShow);
+	if(item == nullptr) SetIcon(iPad, 0,0,0,0,0,false,false,bShow);
 	else
 	{
 		m_item = item;
@@ -118,6 +118,6 @@ void CXuiCtrlCraftIngredientSlot::SetDescription(LPCWSTR Desc)
 	hr=GetVisual(&hObj);
 	XuiElementGetChildById(hObj,L"text_name",&hObjChild);
 	XuiControlSetText(hObjChild,Desc);
-	XuiElementSetShow(hObjChild,Desc==NULL?FALSE:TRUE);
+	XuiElementSetShow(hObjChild,Desc==nullptr?FALSE:TRUE);
 	m_Desc=Desc;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
index 6c7876c9..9a312287 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
@@ -15,10 +15,10 @@ HRESULT CXuiCtrlEnchantmentButton::OnInit(XUIMessageInit* pInitData, BOOL& rfHan
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 	HXUIOBJ parent = m_hObj;
 	HXUICLASS hcInventoryClass = XuiFindClass( L"CXuiSceneEnchant" );
@@ -28,13 +28,13 @@ HRESULT CXuiCtrlEnchantmentButton::OnInit(XUIMessageInit* pInitData, BOOL& rfHan
 	{
 		XuiElementGetParent(parent,&parent);
 		currentClass = XuiGetObjectClass( parent );
-	} while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
+	} while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
 
-	assert( parent != NULL );
+	assert( parent != nullptr );
 
 	VOID *pObj;
 	XuiObjectFromHandle( parent, &pObj );
-	m_containerScene = (CXuiSceneEnchant *)pObj;
+	m_containerScene = static_cast<CXuiSceneEnchant *>(pObj);
 
 	m_index = 0;
 	m_lastCost = 0;
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
index 8a56a0ea..a83b7811 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
@@ -30,12 +30,12 @@ CXuiCtrlEnchantmentBook::CXuiCtrlEnchantmentBook() :
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
-	model = NULL;
+	model = nullptr;
 
 	time = 0;
 	flip = oFlip = flipT = flipA = 0.0f;
@@ -44,7 +44,7 @@ CXuiCtrlEnchantmentBook::CXuiCtrlEnchantmentBook() :
 
 CXuiCtrlEnchantmentBook::~CXuiCtrlEnchantmentBook()
 {
-	//if(model != NULL) delete model;
+	//if(model != nullptr) delete model;
 }
 
 //-----------------------------------------------------------------------------
@@ -60,13 +60,13 @@ HRESULT CXuiCtrlEnchantmentBook::OnInit(XUIMessageInit* pInitData, BOOL& rfHandl
 	{
 		XuiElementGetParent(parent,&parent);
 		currentClass = XuiGetObjectClass( parent );
-	} while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
+	} while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
 
-	assert( parent != NULL );
+	assert( parent != nullptr );
 
 	VOID *pObj;
 	XuiObjectFromHandle( parent, &pObj );
-	m_containerScene = (CXuiSceneEnchant *)pObj;
+	m_containerScene = static_cast<CXuiSceneEnchant *>(pObj);
 
 	last = nullptr;
 
@@ -166,12 +166,12 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
 
 	glEnable(GL_CULL_FACE);
 
-	if(model == NULL)
+	if(model == nullptr)
 	{
 		// Share the model the the EnchantTableRenderer
 
 		EnchantTableRenderer *etr = (EnchantTableRenderer*)TileEntityRenderDispatcher::instance->getRenderer(eTYPE_ENCHANTMENTTABLEENTITY);
-		if(etr != NULL)
+		if(etr != nullptr)
 		{
 			model = etr->bookModel;
 		}
@@ -181,7 +181,7 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
 		}
 	}
 
-    model->render(NULL, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
+    model->render(nullptr, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
 	glDisable(GL_CULL_FACE);
 
     glPopMatrix();
@@ -281,7 +281,7 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
 //
 //    glEnable(GL_RESCALE_NORMAL);
 //
-//    model.render(NULL, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
+//    model.render(nullptr, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
 //
 //    glDisable(GL_RESCALE_NORMAL);
 //    Lighting::turnOff();
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
index 60156a0a..ecb6132d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
@@ -25,10 +25,10 @@ HRESULT CXuiCtrlEnchantmentButtonText::OnInit(XUIMessageInit* pInitData, BOOL& r
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 	HXUIOBJ parent = m_hObj;
 	HXUICLASS hcInventoryClass = XuiFindClass( L"CXuiCtrlEnchantmentButton" );
@@ -38,13 +38,13 @@ HRESULT CXuiCtrlEnchantmentButtonText::OnInit(XUIMessageInit* pInitData, BOOL& r
 	{
 		XuiElementGetParent(parent,&parent);
 		currentClass = XuiGetObjectClass( parent );
-	} while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
+	} while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
 
-	assert( parent != NULL );
+	assert( parent != nullptr );
 
 	VOID *pObj;
 	XuiObjectFromHandle( parent, &pObj );
-	m_parentControl = (CXuiCtrlEnchantmentButton *)pObj;
+	m_parentControl = static_cast<CXuiCtrlEnchantmentButton *>(pObj);
 
 	m_lastCost = 0;
 	m_enchantmentString = L"";
@@ -75,10 +75,10 @@ HRESULT CXuiCtrlEnchantmentButtonText::OnRender(XUIMessageRender *pRenderData, B
 	// Annoyingly, XUI renders everything to a z of 0 so if we want to render anything that needs the z-buffer on top of it, then we need to clear it.
 	// Clear just the region required for this control.
 	D3DRECT clearRect;
-	clearRect.x1 = (int)(matrix._41) - 2;
-	clearRect.y1 = (int)(matrix._42) - 2;
-	clearRect.x2 = (int)(matrix._41 + ( bwidth  * matrix._11 )) + 2;
-	clearRect.y2 = (int)(matrix._42 + ( bheight * matrix._22 )) + 2;
+	clearRect.x1 = static_cast<int>(matrix._41) - 2;
+	clearRect.y1 = static_cast<int>(matrix._42) - 2;
+	clearRect.x2 = static_cast<int>(matrix._41 + (bwidth * matrix._11)) + 2;
+	clearRect.y2 = static_cast<int>(matrix._42 + (bheight * matrix._22)) + 2;
 
 	RenderManager.Clear(GL_DEPTH_BUFFER_BIT, &clearRect);
 	//					glClear(GL_DEPTH_BUFFER_BIT);
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
index b125af39..3d55db19 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
@@ -10,9 +10,9 @@ int CXuiCtrlFireProgress::GetValue()
 	void* pvUserData;
 	this->GetUserData( &pvUserData );
 
-	if( pvUserData != NULL )
+	if( pvUserData != nullptr )
 	{
-		FurnaceTileEntity *pFurnaceTileEntity = (FurnaceTileEntity *)pvUserData;
+		FurnaceTileEntity *pFurnaceTileEntity = static_cast<FurnaceTileEntity *>(pvUserData);
 
 		// TODO This param is a magic number in Java but we should really define it somewhere with a name
 		// I think it is the number of states of the progress display (ie the max value)
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
index 02ee7c93..98ff1c26 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
@@ -22,10 +22,10 @@ CXuiCtrlMinecraftPlayer::CXuiCtrlMinecraftPlayer() :
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 }
 
 //-----------------------------------------------------------------------------
@@ -41,13 +41,13 @@ HRESULT CXuiCtrlMinecraftPlayer::OnInit(XUIMessageInit* pInitData, BOOL& rfHandl
 	{
 		XuiElementGetParent(parent,&parent);
 		currentClass = XuiGetObjectClass( parent );
-	} while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
+	} while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
 
-	assert( parent != NULL );
+	assert( parent != nullptr );
 
 	VOID *pObj;
 	XuiObjectFromHandle( parent, &pObj );
-	m_containerScene = (CXuiSceneInventory *)pObj;
+	m_containerScene = static_cast<CXuiSceneInventory *>(pObj);
 
 	m_iPad = m_containerScene->getPad();
 
@@ -116,7 +116,7 @@ HRESULT CXuiCtrlMinecraftPlayer::OnRender(XUIMessageRender *pRenderData, BOOL &b
 // 
 // 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 // 	{
-// 		if(pMinecraft->localplayers[i] != NULL)
+// 		if(pMinecraft->localplayers[i] != nullptr)
 // 		{
 // 			iPlayerC++;
 // 		}
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
index 0acd250f..1fa44d3f 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
@@ -30,10 +30,10 @@ CXuiCtrlMinecraftSkinPreview::CXuiCtrlMinecraftSkinPreview() :
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 	m_customTextureUrl = L"default";
 	m_backupTexture = TN_MOB_CHAR;
@@ -62,7 +62,7 @@ CXuiCtrlMinecraftSkinPreview::CXuiCtrlMinecraftSkinPreview() :
 	m_fOriginalRotation = 0.0f;
 	m_framesAnimatingRotation = 0;
 	m_bAnimatingToFacing = false;
-	m_pvAdditionalModelParts=NULL;
+	m_pvAdditionalModelParts=nullptr;
 	m_uiAnimOverrideBitmask=0L;
 }
 
@@ -137,7 +137,7 @@ void CXuiCtrlMinecraftSkinPreview::SetFacing(ESkinPreviewFacing facing, bool bAn
 
 void CXuiCtrlMinecraftSkinPreview::CycleNextAnimation()
 {
-	m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation + 1);
+	m_currentAnimation = static_cast<ESkinPreviewAnimations>(m_currentAnimation + 1);
 	if(m_currentAnimation >= e_SkinPreviewAnimation_Count) m_currentAnimation = e_SkinPreviewAnimation_Walking;
 
 	m_swingTime = 0.0f;
@@ -145,8 +145,8 @@ void CXuiCtrlMinecraftSkinPreview::CycleNextAnimation()
 
 void CXuiCtrlMinecraftSkinPreview::CyclePreviousAnimation()
 {
-	m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1);
-	if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1);
+	m_currentAnimation = static_cast<ESkinPreviewAnimations>(m_currentAnimation - 1);
+	if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = static_cast<ESkinPreviewAnimations>(e_SkinPreviewAnimation_Count - 1);
 
 	m_swingTime = 0.0f;
 }
@@ -241,7 +241,7 @@ HRESULT CXuiCtrlMinecraftSkinPreview::OnRender(XUIMessageRender *pRenderData, BO
 	Lighting::turnOn();
 	//glRotatef(-45 - 90, 0, 1, 0);
 
-	glRotatef(-(float)m_xRot, 1, 0, 0);
+	glRotatef(-static_cast<float>(m_xRot), 1, 0, 0);
 
 	// 4J Stu - Turning on hideGui while we do this stops the name rendering in split-screen
 	bool wasHidingGui = pMinecraft->options->hideGui;
@@ -249,7 +249,7 @@ HRESULT CXuiCtrlMinecraftSkinPreview::OnRender(XUIMessageRender *pRenderData, BO
 
 	//EntityRenderDispatcher::instance->render(pMinecraft->localplayers[0], 0, 0, 0, 0, 1);
 	EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_PLAYER);
-    if (renderer != NULL)
+    if (renderer != nullptr)
 	{
 		// 4J-PB - any additional parts to turn on for this player (skin dependent)
 		//vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
@@ -294,12 +294,12 @@ void CXuiCtrlMinecraftSkinPreview::render(EntityRenderer *renderer, double x, do
     glPushMatrix();
     glDisable(GL_CULL_FACE);
 
-	HumanoidModel *model = (HumanoidModel *)renderer->getModel();
+	HumanoidModel *model = static_cast<HumanoidModel *>(renderer->getModel());
 
    //getAttackAnim(mob, a);
-    //if (armor != NULL) armor->attackTime = model->attackTime;
+    //if (armor != nullptr) armor->attackTime = model->attackTime;
     //model->riding = mob->isRiding();
-    //if (armor != NULL) armor->riding = model->riding;
+    //if (armor != nullptr) armor->riding = model->riding;
 
 	// 4J Stu - Remember to reset these values once the rendering is done if you add another one
 	model->attackTime = 0;
@@ -329,7 +329,7 @@ void CXuiCtrlMinecraftSkinPreview::render(EntityRenderer *renderer, double x, do
 				{
 					m_swingTime = 0;
 				}
-				model->attackTime = m_swingTime / (float) (Player::SWING_DURATION * 3);
+				model->attackTime = m_swingTime / static_cast<float>(Player::SWING_DURATION * 3);
 				break;
 			default:
 				break;
@@ -343,7 +343,7 @@ void CXuiCtrlMinecraftSkinPreview::render(EntityRenderer *renderer, double x, do
 
 	//setupPosition(mob, x, y, z);
 	// is equivalent to
-	glTranslatef((float) x, (float) y, (float) z);
+	glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
 
     //float bob = getBob(mob, a);
 #ifdef SKIN_PREVIEW_BOB_ANIM
@@ -415,11 +415,11 @@ void CXuiCtrlMinecraftSkinPreview::render(EntityRenderer *renderer, double x, do
         double xa = sin(yr * PI / 180);
         double za = -cos(yr * PI / 180);
 
-        float flap = (float) yd * 10;
+        float flap = static_cast<float>(yd) * 10;
         if (flap < -6) flap = -6;
         if (flap > 32) flap = 32;
-        float lean = (float) (xd * xa + zd * za) * 100;
-        float lean2 = (float) (xd * za - zd * xa) * 100;
+        float lean = static_cast<float>(xd * xa + zd * za) * 100;
+        float lean2 = static_cast<float>(xd * za - zd * xa) * 100;
         if (lean < 0) lean = 0;
 
         //float pow = 1;//mob->oBob + (bob - mob->oBob) * a;
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
index 84273eb5..9b64dbcb 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
@@ -40,7 +40,7 @@ LPCWSTR CXuiCtrlMinecraftSlot::xzpIcons[15]=
 
 //-----------------------------------------------------------------------------
 CXuiCtrlMinecraftSlot::CXuiCtrlMinecraftSlot() :
-	//m_hBrush(NULL),
+	//m_hBrush(nullptr),
 	m_bDirty(FALSE),
 		m_iPassThroughDataAssociation(0),
 		m_iPassThroughIdAssociation(0),
@@ -60,10 +60,10 @@ CXuiCtrlMinecraftSlot::CXuiCtrlMinecraftSlot() :
 
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
-	if(pMinecraft != NULL)
+	if(pMinecraft != nullptr)
 	{
-		m_fScreenWidth=(float)pMinecraft->width_phys;
-		m_fScreenHeight=(float)pMinecraft->height_phys;
+		m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+		m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
 		m_bScreenWidthSetup = true;
 	}
 }
@@ -109,14 +109,14 @@ HRESULT CXuiCtrlMinecraftSlot::OnGetSourceImage(XUIMessageGetSourceImage* pData,
 			pData->szPath = MsgGetSlotItem.szPath;
 			pData->bDirty = MsgGetSlotItem.bDirty;
 
-			if(MsgGetSlotItem.item != NULL)
+			if(MsgGetSlotItem.item != nullptr)
 			{
 				m_item = MsgGetSlotItem.item;
 				m_iID = m_item->id;
 				m_iPad	= GET_SLOTDISPLAY_USERINDEX_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField);
-				m_fAlpha		= ((float)GET_SLOTDISPLAY_ALPHA_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/31.0f;
+				m_fAlpha		= static_cast<float>(GET_SLOTDISPLAY_ALPHA_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/31.0f;
 				m_bDecorations	= GET_SLOTDISPLAY_DECORATIONS_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField);
-				m_fScale		= ((float)GET_SLOTDISPLAY_SCALE_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/10.0f;
+				m_fScale		= static_cast<float>(GET_SLOTDISPLAY_SCALE_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/10.0f;
 			}
 			else
 			{
@@ -128,10 +128,10 @@ HRESULT CXuiCtrlMinecraftSlot::OnGetSourceImage(XUIMessageGetSourceImage* pData,
 					// 4J Stu - Some parent controls may overide this, others will leave it as what we passed in
 
 					m_iPad	= GET_SLOTDISPLAY_USERINDEX_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField);
-					m_fAlpha		= ((float)GET_SLOTDISPLAY_ALPHA_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/31.0f;
+					m_fAlpha		= static_cast<float>(GET_SLOTDISPLAY_ALPHA_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/31.0f;
 					m_bDecorations	= GET_SLOTDISPLAY_DECORATIONS_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField);
 					m_iCount		= GET_SLOTDISPLAY_COUNT_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField);
-					m_fScale		= ((float)GET_SLOTDISPLAY_SCALE_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/10.0f;
+					m_fScale		= static_cast<float>(GET_SLOTDISPLAY_SCALE_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField))/10.0f;
 					m_popTime		= GET_SLOTDISPLAY_POPTIME_FROM_DATA_BITMASK(MsgGetSlotItem.iDataBitField);
 
 					m_iAuxVal		= GET_SLOTDISPLAY_AUXVAL_FROM_ITEM_BITMASK(MsgGetSlotItem.iItemBitField);
@@ -145,7 +145,7 @@ HRESULT CXuiCtrlMinecraftSlot::OnGetSourceImage(XUIMessageGetSourceImage* pData,
 					pData->szPath = xzpIcons[m_iID-32000];
 				}
 
-				if(m_item != NULL && (m_item->id != m_iID || m_item->getAuxValue() != m_iAuxVal || m_item->GetCount() != m_iCount) ) m_item = nullptr;
+				if(m_item != nullptr && (m_item->id != m_iID || m_item->getAuxValue() != m_iAuxVal || m_item->GetCount() != m_iCount) ) m_item = nullptr;
 			}
 
 
@@ -184,11 +184,11 @@ HRESULT CXuiCtrlMinecraftSlot::OnRender(XUIMessageRender *pRenderData, BOOL &bHa
 	hr = XuiSendMessage(m_hObj, &Message);
 
 	// We cannot have an Item with id 0
-	if(m_item != NULL || (m_iID > 0 && m_iID<32000) )
+	if(m_item != nullptr || (m_iID > 0 && m_iID<32000) )
 	{
 		HXUIDC hDC = pRenderData->hDC;
 		CXuiControl xuiControl(m_hObj);
-		if(m_item == NULL) m_item = shared_ptr<ItemInstance>( new ItemInstance(m_iID, m_iCount, m_iAuxVal) );
+		if(m_item == nullptr) m_item = std::make_shared<ItemInstance>(m_iID, m_iCount, m_iAuxVal);
 
 		// build and render with the game call
 
@@ -217,18 +217,18 @@ HRESULT CXuiCtrlMinecraftSlot::OnRender(XUIMessageRender *pRenderData, BOOL &bHa
 		// Annoyingly, XUI renders everything to a z of 0 so if we want to render anything that needs the z-buffer on top of it, then we need to clear it.
 		// Clear just the region required for this control.
 		D3DRECT clearRect; 
-		clearRect.x1 = (int)(matrix._41) - 2;
-		clearRect.y1 = (int)(matrix._42) - 2;
-		clearRect.x2 = (int)(matrix._41 + ( bwidth  * matrix._11 )) + 2;
-		clearRect.y2 = (int)(matrix._42 + ( bheight * matrix._22 )) + 2;
+		clearRect.x1 = static_cast<int>(matrix._41) - 2;
+		clearRect.y1 = static_cast<int>(matrix._42) - 2;
+		clearRect.x2 = static_cast<int>(matrix._41 + (bwidth * matrix._11)) + 2;
+		clearRect.y2 = static_cast<int>(matrix._42 + (bheight * matrix._22)) + 2;
 
 		if(!m_bScreenWidthSetup)
 		{
 			Minecraft *pMinecraft=Minecraft::GetInstance();
-			if(pMinecraft != NULL)
+			if(pMinecraft != nullptr)
 			{
-				m_fScreenWidth=(float)pMinecraft->width_phys;
-				m_fScreenHeight=(float)pMinecraft->height_phys;
+				m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+				m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
 				m_bScreenWidthSetup = true;
 			}
 		}
@@ -261,14 +261,14 @@ HRESULT CXuiCtrlMinecraftSlot::OnRender(XUIMessageRender *pRenderData, BOOL &bHa
 		if (pop > 0)
 		{
 			glPushMatrix();
-			float squeeze = 1 + pop / (float) Inventory::POP_TIME_DURATION;
+			float squeeze = 1 + pop / static_cast<float>(Inventory::POP_TIME_DURATION);
 			float sx = x;
 			float sy = y;
 			float sxoffs = 8 * scaleX;
 			float syoffs = 12 * scaleY;
-			glTranslatef((float)(sx + sxoffs), (float)(sy + syoffs), 0);
+			glTranslatef(static_cast<float>(sx + sxoffs), static_cast<float>(sy + syoffs), 0);
 			glScalef(1 / squeeze, (squeeze + 1) / 2, 1);
-			glTranslatef((float)-(sx + sxoffs), (float)-(sy + syoffs), 0);
+			glTranslatef(static_cast<float>(-(sx + sxoffs)), static_cast<float>(-(sy + syoffs)), 0);
 		}
 
 		m_pItemRenderer->renderAndDecorateItem(pMinecraft->font, pMinecraft->textures, m_item, x, y,scaleX,scaleY,m_fAlpha,m_isFoil,false);
@@ -284,15 +284,15 @@ HRESULT CXuiCtrlMinecraftSlot::OnRender(XUIMessageRender *pRenderData, BOOL &bHa
 			{				
 				glPushMatrix();		
 				glScalef(scaleX, scaleY, 1.0f);
-				int iX= (int)(0.5f+((float)x)/scaleX);
-				int iY= (int)(0.5f+((float)y)/scaleY);
+				int iX= static_cast<int>(0.5f + ((float)x) / scaleX);
+				int iY= static_cast<int>(0.5f + ((float)y) / scaleY);
 
 				m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, m_item, iX, iY, m_fAlpha);
 				glPopMatrix();
 			}
 			else
 			{
-				m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, m_item, (int)x, (int)y, m_fAlpha);
+				m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, m_item, static_cast<int>(x), static_cast<int>(y), m_fAlpha);
 			}
 		}
 
@@ -329,9 +329,9 @@ void CXuiCtrlMinecraftSlot::SetIcon(int iPad, int iId,int iAuxVal, int iCount, i
 		m_iAuxVal = 0;
 
 	m_iCount=iCount;
-	m_fScale	= (float)(iScale)/10.0f;
+	m_fScale	= static_cast<float>(iScale)/10.0f;
 	//m_uiAlpha=uiAlpha;
-	m_fAlpha       =((float)(uiAlpha)) / 255.0f;
+	m_fAlpha       =static_cast<float>(uiAlpha) / 255.0f;
 	m_bDecorations = bDecorations;
 	// 	mif(bDecorations) m_iDecorations=1;
 	// 	else m_iDecorations=0;
@@ -348,8 +348,8 @@ void CXuiCtrlMinecraftSlot::SetIcon(int iPad, shared_ptr<ItemInstance> item, int
 	m_item = item;
 	m_isFoil = item->isFoil();
 	m_iPad = iPad;
-	m_fScale = (float)(iScale)/10.0f;
-	m_fAlpha =((float)(uiAlpha)) / 31;
+	m_fScale = static_cast<float>(iScale)/10.0f;
+	m_fAlpha =static_cast<float>(uiAlpha) / 31;
 	m_bDecorations = bDecorations;
 	m_bDirty = TRUE;
 	XuiElementSetShow(m_hObj,bShow);
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.cpp
index 23b22573..6a76980d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.cpp
@@ -38,9 +38,9 @@ HRESULT CXuiCtrlMobEffect::OnGetSourceDataText(XUIMessageGetSourceText *pGetSour
 		pGetSourceTextData->szText = m_name.c_str();
 		pGetSourceTextData->bDisplay = TRUE;
 
-		if(FAILED(PlayVisualRange(iconFrameNames[m_icon],NULL,iconFrameNames[m_icon])))
+		if(FAILED(PlayVisualRange(iconFrameNames[m_icon],nullptr,iconFrameNames[m_icon])))
 		{
-			PlayVisualRange(L"Normal",NULL,L"Normal");
+			PlayVisualRange(L"Normal",nullptr,L"Normal");
 		}
 
 		bHandled = TRUE;
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SliderWrapper.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SliderWrapper.cpp
index a4e9f6be..18995854 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SliderWrapper.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SliderWrapper.cpp
@@ -10,11 +10,11 @@ HRESULT CXuiCtrlSliderWrapper::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 
 	XuiElementGetChildById(m_hObj,L"FocusSink",&hObjChild);
 	XuiObjectFromHandle( hObjChild, &pObj );
-	m_pFocusSink = (CXuiControl *)pObj;
+	m_pFocusSink = static_cast<CXuiControl *>(pObj);
 
 	XuiElementGetChildById(m_hObj,L"XuiSlider",&hObjChild);
 	XuiObjectFromHandle( hObjChild, &pObj );
-	m_pSlider = (CXuiSlider *)pObj;
+	m_pSlider = static_cast<CXuiSlider *>(pObj);
 
 	m_sliderActive = false;
 	m_bDisplayVal=true;
@@ -119,7 +119,7 @@ HRESULT CXuiCtrlSliderWrapper::SetValueDisplay( BOOL bShow )
 	hr=XuiControlGetVisual(pThis->m_pSlider->m_hObj,&hVisual);
 	hr=XuiElementGetChildById(hVisual,L"Text_Value",&hText);
 
-	if(hText!=NULL)
+	if(hText!=nullptr)
 	{
 		XuiElementSetShow(hText,bShow);
 	}
@@ -132,7 +132,7 @@ LPCWSTR CXuiCtrlSliderWrapper::GetText(  )
 	CXuiCtrlSliderWrapper *pThis;
 	HRESULT hr = XuiObjectFromHandle(m_hObj, (void **) &pThis);
 	if (FAILED(hr))
-		return NULL;
+		return nullptr;
 	return pThis->m_pSlider->GetText();
 	//return S_OK;
 }
@@ -159,7 +159,7 @@ HXUIOBJ CXuiCtrlSliderWrapper::GetSlider()
 	CXuiCtrlSliderWrapper *pThis;
 	HRESULT hr = XuiObjectFromHandle(m_hObj, (void **) &pThis);
 	if (FAILED(hr))
-		return NULL;
+		return nullptr;
 	return pThis->m_pSlider->m_hObj;
 }
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
index f8ceeb69..8a45d6fc 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
@@ -12,7 +12,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnInit( HXUIOBJ hObj, XUIMessageInit* pInitDat
 {
 	HRESULT hr = S_OK;
 	SlotControlUserDataContainer* pvUserData = new SlotControlUserDataContainer();
-	hr = XuiElementSetUserData(hObj, (void *)pvUserData );
+	hr = XuiElementSetUserData(hObj, static_cast<void *>(pvUserData) );
 
 	// 4J WESTY : Pointer Prototype : Added to support prototype only.
 	m_bSkipDefaultNavigation = false;
@@ -26,7 +26,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnDestroy( HXUIOBJ hObj )
 	void* pvUserData;
 	hr = XuiElementGetUserData( hObj, &pvUserData );
 
-	if( pvUserData != NULL )
+	if( pvUserData != nullptr )
 	{
 		delete pvUserData;
 	}
@@ -41,19 +41,19 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnCustomMessage_GetSlotItem(HXUIOBJ hObj, Cust
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
 
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
-	if( pUserDataContainer->slot != NULL )
+	if( pUserDataContainer->slot != nullptr )
 	{
 		item = pUserDataContainer->slot->getItem();
 	}
 	else if(pUserDataContainer->m_iPad >= 0 && pUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad] );
-		if(player != NULL) item = player->inventory->getCarried();
+		if(player != nullptr) item = player->inventory->getCarried();
 	}
 
-	if( item != NULL )
+	if( item != nullptr )
 	{
 		pData->item = item;
 		pData->iItemBitField = MAKE_SLOTDISPLAY_ITEM_BITMASK(item->id,item->getAuxValue(),item->isFoil());
@@ -64,7 +64,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnCustomMessage_GetSlotItem(HXUIOBJ hObj, Cust
 		// 11 bits - auxval
 		//  6 bits - count
 		//  6 bits - scale
-		pData->iDataBitField = MAKE_SLOTDISPLAY_DATA_BITMASK(pUserDataContainer->m_iPad, (int)(31*pUserDataContainer->m_fAlpha),true,item->GetCount(),7,item->popTime);
+		pData->iDataBitField = MAKE_SLOTDISPLAY_DATA_BITMASK(pUserDataContainer->m_iPad, static_cast<int>(31 * pUserDataContainer->m_fAlpha),true,item->GetCount(),7,item->popTime);
 	}
 	else
 	{
@@ -82,7 +82,7 @@ void CXuiCtrlSlotItemCtrlBase::SetSlot( HXUIOBJ hObj, Slot* slot )
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
 
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
 	pUserDataContainer->slot = slot;
 }
@@ -92,7 +92,7 @@ void CXuiCtrlSlotItemCtrlBase::SetUserIndex(  HXUIOBJ hObj, int iPad )
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
 
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
 	pUserDataContainer->m_iPad = iPad;
 }
@@ -102,7 +102,7 @@ void CXuiCtrlSlotItemCtrlBase::SetAlpha(  HXUIOBJ hObj, float fAlpha )
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
 
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
 	pUserDataContainer->m_fAlpha = fAlpha;
 }
@@ -111,16 +111,16 @@ bool CXuiCtrlSlotItemCtrlBase::isEmpty( HXUIOBJ hObj )
 {
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
-	if(pUserDataContainer->slot != NULL)
+	if(pUserDataContainer->slot != nullptr)
 	{
 		return !pUserDataContainer->slot->hasItem();
 	}
 	else if(pUserDataContainer->m_iPad >= 0 && pUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad] );
-		if(player != NULL) return player->inventory->getCarried() == NULL;
+		if(player != nullptr) return player->inventory->getCarried() == nullptr;
 
 	}
 	return true;
@@ -130,9 +130,9 @@ wstring CXuiCtrlSlotItemCtrlBase::GetItemDescription( HXUIOBJ hObj, vector<wstri
 {
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
-	if(pUserDataContainer->slot != NULL)
+	if(pUserDataContainer->slot != nullptr)
 	{
 		wstring desc = L"";
 		vector<wstring> *strings = pUserDataContainer->slot->getItem()->getHoverText(Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad], false, unformattedStrings);
@@ -167,10 +167,10 @@ wstring CXuiCtrlSlotItemCtrlBase::GetItemDescription( HXUIOBJ hObj, vector<wstri
 	else if(pUserDataContainer->m_iPad >= 0 && pUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad] );
-		if(player != NULL)
+		if(player != nullptr)
 		{
 			shared_ptr<ItemInstance> item = player->inventory->getCarried();
-			if(item != NULL) return app.GetString( item->getDescriptionId() );
+			if(item != nullptr) return app.GetString( item->getDescriptionId() );
 		}
 
 	}
@@ -181,16 +181,16 @@ shared_ptr<ItemInstance> CXuiCtrlSlotItemCtrlBase::getItemInstance( HXUIOBJ hObj
 {
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
-	if(pUserDataContainer->slot != NULL)
+	if(pUserDataContainer->slot != nullptr)
 	{
 		return pUserDataContainer->slot->getItem();
 	}
 	else if(pUserDataContainer->m_iPad >= 0 && pUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad] );
-		if(player != NULL) return player->inventory->getCarried();
+		if(player != nullptr) return player->inventory->getCarried();
 
 	}
 	return nullptr;
@@ -200,7 +200,7 @@ Slot *CXuiCtrlSlotItemCtrlBase::getSlot( HXUIOBJ hObj )
 {
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
 	return pUserDataContainer->slot;
 }
@@ -254,11 +254,11 @@ int CXuiCtrlSlotItemCtrlBase::GetObjectCount( HXUIOBJ hObj )
 {
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
 	int iCount = 0;
 
-	if(pUserDataContainer->slot != NULL)
+	if(pUserDataContainer->slot != nullptr)
 	{
 		if ( pUserDataContainer->slot->hasItem() )
 		{
@@ -268,7 +268,7 @@ int CXuiCtrlSlotItemCtrlBase::GetObjectCount( HXUIOBJ hObj )
 	else if(pUserDataContainer->m_iPad >= 0 && pUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad] );
-		if(player != NULL && player->inventory->getCarried() != NULL)
+		if(player != nullptr && player->inventory->getCarried() != nullptr)
 		{
 			iCount = player->inventory->getCarried()->count;
 		}
@@ -294,9 +294,9 @@ bool CXuiCtrlSlotItemCtrlBase::IsSameItemAs( HXUIOBJ hThisObj, HXUIOBJ hOtherObj
 	// Get the info on this item.
 	void* pvThisUserData;
 	XuiElementGetUserData( hThisObj, &pvThisUserData );
-	SlotControlUserDataContainer* pThisUserDataContainer = (SlotControlUserDataContainer*)pvThisUserData;
+	SlotControlUserDataContainer* pThisUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvThisUserData);
 
-	if(pThisUserDataContainer->slot != NULL)
+	if(pThisUserDataContainer->slot != nullptr)
 	{
 		if ( pThisUserDataContainer->slot->hasItem() )
 		{
@@ -309,7 +309,7 @@ bool CXuiCtrlSlotItemCtrlBase::IsSameItemAs( HXUIOBJ hThisObj, HXUIOBJ hOtherObj
 	else if(pThisUserDataContainer->m_iPad >= 0 && pThisUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pThisUserDataContainer->m_iPad] );
-		if(player != NULL && player->inventory->getCarried() != NULL)
+		if(player != nullptr && player->inventory->getCarried() != nullptr)
 		{
 			iThisID = player->inventory->getCarried()->id;
 			iThisAux = player->inventory->getCarried()->getAuxValue();
@@ -322,9 +322,9 @@ bool CXuiCtrlSlotItemCtrlBase::IsSameItemAs( HXUIOBJ hThisObj, HXUIOBJ hOtherObj
 	// Get the info on other item.
 	void* pvOtherUserData;
 	XuiElementGetUserData( hOtherObj, &pvOtherUserData );
-	SlotControlUserDataContainer* pOtherUserDataContainer = (SlotControlUserDataContainer*)pvOtherUserData;
+	SlotControlUserDataContainer* pOtherUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvOtherUserData);
 
-	if(pOtherUserDataContainer->slot != NULL)
+	if(pOtherUserDataContainer->slot != nullptr)
 	{
 		if ( pOtherUserDataContainer->slot->hasItem() )
 		{
@@ -336,7 +336,7 @@ bool CXuiCtrlSlotItemCtrlBase::IsSameItemAs( HXUIOBJ hThisObj, HXUIOBJ hOtherObj
 	else if(pOtherUserDataContainer->m_iPad >= 0 && pOtherUserDataContainer->m_iPad < XUSER_MAX_COUNT)
 	{
 		shared_ptr<Player> player = dynamic_pointer_cast<Player>( Minecraft::GetInstance()->localplayers[pOtherUserDataContainer->m_iPad] );
-		if(player != NULL && player->inventory->getCarried() != NULL)
+		if(player != nullptr && player->inventory->getCarried() != nullptr)
 		{
 			iOtherID = player->inventory->getCarried()->id;
 			iOtherAux = player->inventory->getCarried()->getAuxValue();
@@ -363,13 +363,13 @@ int	CXuiCtrlSlotItemCtrlBase::GetEmptyStackSpace( HXUIOBJ hObj )
 
 	void* pvUserData;
 	XuiElementGetUserData( hObj, &pvUserData );
-	SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
+	SlotControlUserDataContainer* pUserDataContainer = static_cast<SlotControlUserDataContainer *>(pvUserData);
 
 	int iCount = 0;
 	int iMaxStackSize = 0;
 	bool bStackable = false;
 
-	if(pUserDataContainer->slot != NULL)
+	if(pUserDataContainer->slot != nullptr)
 	{
 		if ( pUserDataContainer->slot->hasItem() )
 		{
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
index 2fd21749..ac237ac9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
@@ -9,7 +9,7 @@ class ItemInstance;
 class SlotControlUserDataContainer
 {
 public:
-	SlotControlUserDataContainer() : slot( NULL ), hProgressBar( NULL ), m_iPad( -1 ), m_fAlpha(1.0f) {};
+	SlotControlUserDataContainer() : slot( nullptr ), hProgressBar( nullptr ), m_iPad( -1 ), m_fAlpha(1.0f) {};
 	Slot* slot;
 	HXUIOBJ hProgressBar;
 	float m_fAlpha;
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
index 7e51c885..a34f2a7e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
@@ -103,7 +103,7 @@ void CXuiCtrlSlotList::SetData(int m_iPad, AbstractContainerMenu* menu, int rows
 
 		slotControl->SetUserIndex( slotControl->m_hObj,  m_iPad );
 
-		slotControl = NULL;
+		slotControl = nullptr;
 	}
 }
 
@@ -226,6 +226,6 @@ void CXuiCtrlSlotList::GetCXuiCtrlSlotItem(int itemIndex, CXuiCtrlSlotItemListIt
 	HXUIOBJ itemControl = this->GetItemControl(itemIndex);
 	VOID *pObj;
 	XuiObjectFromHandle( itemControl, &pObj );
-	*CXuiCtrlSlotItem = (CXuiCtrlSlotItemListItem *)pObj;
+	*CXuiCtrlSlotItem = static_cast<CXuiCtrlSlotItemListItem *>(pObj);
 }
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
index 2e971710..874edc6f 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
@@ -20,10 +20,10 @@ CXuiCtrlSplashPulser::CXuiCtrlSplashPulser() :
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_CustomMessages.h b/Minecraft.Client/Common/XUI/XUI_CustomMessages.h
index 888f8ad0..e16f891c 100644
--- a/Minecraft.Client/Common/XUI/XUI_CustomMessages.h
+++ b/Minecraft.Client/Common/XUI/XUI_CustomMessages.h
@@ -39,11 +39,11 @@ CustomMessage_GetSlotItem_Struct;
 static __declspec(noinline) void CustomMessage_GetSlotItem(XUIMessage *pMsg, CustomMessage_GetSlotItem_Struct* pData, int iDataBitField, int iItemBitField)
 {
 	XuiMessage(pMsg,XM_GETSLOTITEM_MESSAGE);
-	_XuiMessageExtra(pMsg,(XUIMessageData*) pData, sizeof(*pData));
+	_XuiMessageExtra(pMsg,static_cast<XUIMessageData *>(pData), sizeof(*pData));
 	pData->item = nullptr;
 	pData->iDataBitField = iDataBitField;
 	pData->iItemBitField = iItemBitField;
-	pData->szPath = NULL;
+	pData->szPath = nullptr;
 	pData->bDirty = false;
 }
 
@@ -68,7 +68,7 @@ CustomMessage_Splitscreenplayer_Struct;
 static __declspec(noinline) void CustomMessage_Splitscreenplayer(XUIMessage *pMsg, CustomMessage_Splitscreenplayer_Struct* pData, bool bJoining)
 {
 	XuiMessage(pMsg,XM_SPLITSCREENPLAYER_MESSAGE);
-	_XuiMessageExtra(pMsg,(XUIMessageData*) pData, sizeof(*pData));
+	_XuiMessageExtra(pMsg,static_cast<XUIMessageData *>(pData), sizeof(*pData));
 	pData->bJoining = bJoining;
 }
 
diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
index bd05ca14..c5150249 100644
--- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
@@ -24,7 +24,7 @@
 
 HRESULT CScene_DLCMain::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	iPad = *(int *) pInitData->pvInitData;
+	iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 	
@@ -39,7 +39,7 @@ HRESULT CScene_DLCMain::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 		VOID *pObj;
 		XuiObjectFromHandle( xList, &pObj );
-		list = (CXuiCtrl4JList *) pObj;
+		list = static_cast<CXuiCtrl4JList *>(pObj);
 
 		ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK );
 
@@ -162,7 +162,7 @@ HRESULT CScene_DLCMain::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNo
 		param->iType = iIndex;
 
 		// promote the DLC content request type 
-		app.AddDLCRequest((eDLCMarketplaceType)iIndex, true);
+		app.AddDLCRequest(static_cast<eDLCMarketplaceType>(iIndex), true);
 		app.NavigateToScene(iPad,eUIScene_DLCOffersMenu, param);
 	}
 	return S_OK;
@@ -182,14 +182,14 @@ HRESULT CScene_DLCMain::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 //----------------------------------------------------------------------------------
 HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	DLCOffersParam *param = (DLCOffersParam *) pInitData->pvInitData;
+	DLCOffersParam *param = static_cast<DLCOffersParam *>(pInitData->pvInitData);
 	m_iPad = param->iPad;
 	m_iType = param->iType;
 	m_iOfferC = app.GetDLCOffersCount();
 	m_bIsFemale = false;
-	m_pNoImageFor_DLC=NULL;
+	m_pNoImageFor_DLC=nullptr;
 	bNoDLCToDisplay=true;
-	//hCostText=NULL;
+	//hCostText=nullptr;
 
 	
 	// 4J JEV: Deleting this here seems simpler.
@@ -203,10 +203,10 @@ HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 		HRESULT hRes;
 
 
-		hRes=XAvatarInitialize(XAVATAR_COORDINATE_SYSTEM_LEFT_HANDED,0,0,0,NULL);
+		hRes=XAvatarInitialize(XAVATAR_COORDINATE_SYSTEM_LEFT_HANDED,0,0,0,nullptr);
 
 		// get the avatar gender
-		hRes=XAvatarGetMetadataLocalUser(m_iPad,&AvatarMetadata,NULL);
+		hRes=XAvatarGetMetadataLocalUser(m_iPad,&AvatarMetadata,nullptr);
 
 		m_bIsFemale= (XAVATAR_BODY_TYPE_FEMALE == XAvatarMetadataGetBodyType(&AvatarMetadata));
 		// shutdown the avatar system
@@ -223,10 +223,10 @@ HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	m_bIgnorePress=true;
 
 	VOID *pObj;
-	m_hXuiBrush=NULL;
+	m_hXuiBrush=nullptr;
 
 	XuiObjectFromHandle( m_List, &pObj );
-	m_pOffersList = (CXuiCtrl4JList *)pObj;
+	m_pOffersList = static_cast<CXuiCtrl4JList *>(pObj);
 	m_bAllDLCContentRetrieved=false;
 
 	XuiElementInitUserFocus(m_hObj,ProfileManager.GetPrimaryPad(),TRUE);
@@ -242,7 +242,7 @@ HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	// Is the DLC we're looking for available?
 	if(!m_bDLCRequiredIsRetrieved)
 	{
-		if(app.DLCContentRetrieved((eDLCMarketplaceType)m_iType))
+		if(app.DLCContentRetrieved(static_cast<eDLCMarketplaceType>(m_iType)))
 		{	
 			m_bDLCRequiredIsRetrieved=true;
 
@@ -259,13 +259,13 @@ HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 {
-	CXuiCtrl4JList::LIST_ITEM_INFO *pListInfo=NULL;
+	CXuiCtrl4JList::LIST_ITEM_INFO *pListInfo=nullptr;
 	//XMARKETPLACE_CONTENTOFFER_INFO xOffer;
 	XMARKETPLACE_CURRENCY_CONTENTOFFER_INFO xOffer;
 	const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string 
 	WCHAR szResourceLocator[ LOCATOR_SIZE ];
 	ZeroMemory(szResourceLocator,sizeof(WCHAR)*LOCATOR_SIZE);
-	const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
+	const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr);
 	int iCount=0;
 
 	if(bUpdateOnly) // Just update the info on the current list
@@ -275,13 +275,13 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 			xOffer = StorageManager.GetOffer(i);
 			// Check that this is in the list of known DLC
 			DLC_INFO *pDLC=app.GetDLCInfoForFullOfferID(xOffer.qwOfferID);
-			if(pDLC==NULL)
+			if(pDLC==nullptr)
 			{
 				// try the trial version
 				pDLC=app.GetDLCInfoForTrialOfferID(xOffer.qwOfferID);
 			}
 
-			if(pDLC==NULL)
+			if(pDLC==nullptr)
 			{
 				// skip this one
 #ifdef _DEBUG
@@ -301,7 +301,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 
 			// can't trust the offer type - partnernet is giving avatar items the CONTENT type
 			//if(Offer.dwOfferType==app.GetDLCContentType((eDLCContentType)m_iType))
-			if(pDLC->eDLCType==(eDLCContentType)m_iType)
+			if(pDLC->eDLCType==static_cast<eDLCContentType>(m_iType))
 			{		
 				if(xOffer.fUserHasPurchased)
 				{
@@ -343,13 +343,13 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 
 			// Check that this is in the list of known DLC
 			DLC_INFO *pDLC=app.GetDLCInfoForFullOfferID(xOffer.qwOfferID);
-			if(pDLC==NULL)
+			if(pDLC==nullptr)
 			{
 				// try the trial version
 				pDLC=app.GetDLCInfoForTrialOfferID(xOffer.qwOfferID);
 			}
 
-			if(pDLC==NULL)
+			if(pDLC==nullptr)
 			{
 				// skip this one
 #ifdef _DEBUG
@@ -362,7 +362,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 
 			// can't trust the offer type - partnernet is giving avatar items the CONTENT type
 			//if(Offer.dwOfferType==app.GetDLCContentType((eDLCContentType)m_iType))
-			if(pDLC->eDLCType==(eDLCContentType)m_iType)
+			if(pDLC->eDLCType==static_cast<eDLCContentType>(m_iType))
 			{		
 				wstring wstrTemp=xOffer.wszOfferName;
 
@@ -395,7 +395,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 
 				// store the offer index
 				pListInfo[iCount].iData=i;
-				pListInfo[iCount].iSortIndex=(int)pDLC->uiSortIndex;
+				pListInfo[iCount].iSortIndex=static_cast<int>(pDLC->uiSortIndex);
 #ifdef _DEBUG
 				app.DebugPrintf("Adding ");
 				OutputDebugStringW(pListInfo[iCount].pwszText);
@@ -447,9 +447,9 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 		m_pOffersList->SetCurSelVisible(0);
 
 		DLC_INFO *dlc = app.GetDLCInfoForFullOfferID(xOffer.qwOfferID);
-		if (dlc != NULL)
+		if (dlc != nullptr)
 		{
-			BYTE *pData=NULL;
+			BYTE *pData=nullptr;
 			UINT uiSize=0;
 			DWORD dwSize=0;
 
@@ -460,7 +460,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 			if(iIndex!=-1)
 			{
 				// it's in the xzp
-				if(m_hXuiBrush!=NULL)
+				if(m_hXuiBrush!=nullptr)
 				{
 					XuiDestroyBrush(m_hXuiBrush);
 					// clear the TMS XZP vector memory
@@ -480,7 +480,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 				}
 				else
 				{
-					if(m_hXuiBrush!=NULL)
+					if(m_hXuiBrush!=nullptr)
 					{
 						XuiDestroyBrush(m_hXuiBrush);
 						// clear the TMS XZP vector memory
@@ -568,7 +568,7 @@ HRESULT CScene_DLCOffers::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* p
 		// if it's already been purchased, we need to let the user download it anyway
 		{
 			ullIndexA[0]=StorageManager.GetOffer(ItemInfo.iData).qwOfferID;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 		}	
 	}
 	
@@ -662,7 +662,7 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
 	// reset the image monitor, but not for the first selection
 	if(pNotifySelChangedData->iOldItem!=-1)
 	{
-		m_pNoImageFor_DLC=NULL;
+		m_pNoImageFor_DLC=nullptr;
 	}
 
 	if (m_List.TreeHasFocus())// && offerIndexes.size() > index)
@@ -695,14 +695,14 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
 		m_PriceTag.SetText(xOffer.wszCurrencyPrice);
 
 		DLC_INFO *dlc = app.GetDLCInfoForTrialOfferID(xOffer.qwOfferID);
-		if(dlc==NULL)
+		if(dlc==nullptr)
 		{
 			dlc = app.GetDLCInfoForFullOfferID(xOffer.qwOfferID);
 		}
 
-		if (dlc != NULL)
+		if (dlc != nullptr)
 		{
-			BYTE *pImage=NULL;
+			BYTE *pImage=nullptr;
 			UINT uiSize=0;
 			DWORD dwSize=0;
 
@@ -713,7 +713,7 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
 			if(iIndex!=-1)
 			{
 				// it's in the xzp
-				if(m_hXuiBrush!=NULL)
+				if(m_hXuiBrush!=nullptr)
 				{
 					XuiDestroyBrush(m_hXuiBrush);
 					// clear the TMS XZP vector memory
@@ -737,7 +737,7 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
 				}
 				else
 				{
-					if(m_hXuiBrush!=NULL)
+					if(m_hXuiBrush!=nullptr)
 					{
 						XuiDestroyBrush(m_hXuiBrush);
 						// clear the TMS XZP vector memory
@@ -750,13 +750,13 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
 		}	
 		else
 		{
-			if(m_hXuiBrush!=NULL)
+			if(m_hXuiBrush!=nullptr)
 			{
 				XuiDestroyBrush(m_hXuiBrush);
 				// clear the TMS XZP vector memory
 				//app.FreeLocalTMSFiles();
 
-				m_hXuiBrush=NULL;
+				m_hXuiBrush=nullptr;
 			}
 		}
 
@@ -791,7 +791,7 @@ HRESULT CScene_DLCOffers::OnTimer(XUIMessageTimer *pData,BOOL& rfHandled)
 	// Is the DLC we're looking for available?
 	if(!m_bDLCRequiredIsRetrieved)
 	{
-		if(app.DLCContentRetrieved((eDLCMarketplaceType)m_iType))
+		if(app.DLCContentRetrieved(static_cast<eDLCMarketplaceType>(m_iType)))
 		{	
 			m_bDLCRequiredIsRetrieved=true;
 		
@@ -802,7 +802,7 @@ HRESULT CScene_DLCOffers::OnTimer(XUIMessageTimer *pData,BOOL& rfHandled)
 	}
 
 	// Check for any TMS image we're waiting for
-	if(m_pNoImageFor_DLC!=NULL)
+	if(m_pNoImageFor_DLC!=nullptr)
 	{
 		// Is it present now?
 		WCHAR *cString = m_pNoImageFor_DLC->wchBanner;
@@ -811,10 +811,10 @@ HRESULT CScene_DLCOffers::OnTimer(XUIMessageTimer *pData,BOOL& rfHandled)
 
 		if(bPresent)
 		{
-			BYTE *pImage=NULL;
+			BYTE *pImage=nullptr;
 			DWORD dwSize=0;
 
-			if(m_hXuiBrush!=NULL)
+			if(m_hXuiBrush!=nullptr)
 			{
 				XuiDestroyBrush(m_hXuiBrush);
 				// clear the TMS XZP vector memory
@@ -822,7 +822,7 @@ HRESULT CScene_DLCOffers::OnTimer(XUIMessageTimer *pData,BOOL& rfHandled)
 			}
 			app.GetMemFileDetails(cString,&pImage,&dwSize);
 			XuiCreateTextureBrushFromMemory(pImage,dwSize,&m_hXuiBrush);
-			m_pNoImageFor_DLC=NULL;
+			m_pNoImageFor_DLC=nullptr;
 		}
 	}
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp
index 83275c14..1788ceff 100644
--- a/Minecraft.Client/Common/XUI/XUI_Death.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp
@@ -26,7 +26,7 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_Death::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {	
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	m_bIgnoreInput = false;
 
@@ -59,7 +59,7 @@ HRESULT CScene_Death::OnNotifySelChanged( HXUIOBJ hObjSource, XUINotifySelChange
 		XuiSetLocale( Languages[curSel].pszLanguagePath );
 
 		// Apply the locale to the main scene.
-		XuiApplyLocale( m_hObj, NULL );
+		XuiApplyLocale( m_hObj, nullptr );
 
 		// Update the text for the current value.
 		m_Value.SetText( m_List.GetText( curSel ) );*/
@@ -105,9 +105,9 @@ HRESULT CScene_Death::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNoti
 				if(pNotifyPressData->UserIndex==ProfileManager.GetPrimaryPad())
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != NULL )
+					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
 					}
 					TelemetryManager->RecordLevelExit(pNotifyPressData->UserIndex, eSen_LevelExitStatus_Failed);
 					
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
index 6b96a4e3..d8c06ae1 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
@@ -14,13 +14,13 @@ HRESULT CScene_DebugItemEditor::OnInit( XUIMessageInit *pInitData, BOOL &bHandle
 {
 	MapChildControls();
 
-	ItemEditorInput *initData = (ItemEditorInput *)pInitData->pvInitData;
+	ItemEditorInput *initData = static_cast<ItemEditorInput *>(pInitData->pvInitData);
 	m_iPad = initData->iPad;
 	m_slot = initData->slot;
 	m_menu = initData->menu;
-	if(m_slot != NULL) m_item = m_slot->getItem();
+	if(m_slot != nullptr) m_item = m_slot->getItem();
 
-	if(m_item!=NULL)
+	if(m_item!=nullptr)
 	{
 		m_icon->SetIcon(m_iPad, m_item->id,m_item->getAuxValue(),m_item->count,10,31,false,m_item->isFoil());
 		m_itemName.SetText( app.GetString( Item::items[m_item->id]->getDescriptionId(m_item) ) );
@@ -54,13 +54,13 @@ HRESULT CScene_DebugItemEditor::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfH
 	case VK_PAD_START:
 	case VK_PAD_BACK:
 		// We need to send a packet to the server to update it's representation of this item
-		if(m_slot != NULL && m_menu != NULL)
+		if(m_slot != nullptr && m_menu != nullptr)
 		{
 			m_slot->set(m_item);
 
 			Minecraft *pMinecraft = Minecraft::GetInstance();
 			shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
-			if(player != NULL && player->connection) player->connection->send( shared_ptr<ContainerSetSlotPacket>( new ContainerSetSlotPacket(m_menu->containerId, m_slot->index, m_item) ) );
+			if(player != nullptr && player->connection) player->connection->send(std::make_shared<ContainerSetSlotPacket>(m_menu->containerId, m_slot->index, m_item));
 		}
 		// kill the crafting xui
 		app.NavigateBack(m_iPad);
@@ -76,7 +76,7 @@ HRESULT CScene_DebugItemEditor::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfH
 
 HRESULT CScene_DebugItemEditor::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotifyValueChanged *pNotifyValueChangedData, BOOL &bHandled)
 {
-	if(m_item == NULL) m_item = shared_ptr<ItemInstance>( new ItemInstance(0,1,0) );
+	if(m_item == nullptr) m_item = std::make_shared<ItemInstance>(0, 1, 0);
 	if(hObjSource == m_itemId)
 	{
 		int id = 0;
@@ -84,7 +84,7 @@ HRESULT CScene_DebugItemEditor::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINot
 		if(!value.empty()) id = _fromString<int>( value );
 
 		// TODO Proper validation of the valid item ids
-		if(id > 0 && Item::items[id] != NULL) m_item->id = id;
+		if(id > 0 && Item::items[id] != nullptr) m_item->id = id;
 	}
 	else if(hObjSource == m_itemAuxValue)
 	{
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
index e6db6a80..338eb853 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
@@ -37,7 +37,7 @@ HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 
 	for(unsigned int i = 0; i < Item::items.length; ++i)
 	{
-		if(Item::items[i] != NULL)
+		if(Item::items[i] != nullptr)
 		{
 			//m_items.InsertItems(m_items.GetItemCount(),1);
 			m_itemIds.push_back(i);
@@ -102,7 +102,7 @@ HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	m_setTime.SetValue( pMinecraft->level->getLevelData()->getTime() % 24000 );
-	m_setFov.SetValue( (int)pMinecraft->gameRenderer->GetFovVal());
+	m_setFov.SetValue( static_cast<int>(pMinecraft->gameRenderer->GetFovVal()));
 
 	XuiSetTimer(m_hObj,0,DEBUG_OVERLAY_UPDATE_TIME_PERIOD);
 
@@ -148,7 +148,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 	/*else if( hObjPressed == m_saveToDisc ) // 4J-JEV: Doesn't look like we use this debug option anymore.
 	{
 #ifndef _CONTENT_PACKAGE
-		pMinecraft->level->save(true, NULL);
+		pMinecraft->level->save(true, nullptr);
 
 		int radius;
 		m_chunkRadius.GetValue(&radius);
@@ -166,7 +166,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 	{
 #ifndef _CONTENT_PACKAGE
 		// load from the .xzp file
-		const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
+		const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr);
 
 		HXUIOBJ hScene;
 		HRESULT hr;
@@ -175,7 +175,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 		WCHAR szResourceLocator[ LOCATOR_SIZE ];
 
 		swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/");
-		hr = XuiSceneCreate(szResourceLocator,app.GetSceneName(eUIScene_DebugCreateSchematic,false, false), NULL, &hScene);
+		hr = XuiSceneCreate(szResourceLocator,app.GetSceneName(eUIScene_DebugCreateSchematic,false, false), nullptr, &hScene);
 		this->NavigateForward(hScene);
 		//app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugCreateSchematic);
 #endif
@@ -184,7 +184,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 	{
 #ifndef _CONTENT_PACKAGE
 		// load from the .xzp file
-		const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
+		const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr);
 
 		HXUIOBJ hScene;
 		HRESULT hr;
@@ -193,7 +193,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 		WCHAR szResourceLocator[ LOCATOR_SIZE ];
 
 		swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/");
-		hr = XuiSceneCreate(szResourceLocator,app.GetSceneName(eUIScene_DebugSetCamera, false, false), NULL, &hScene);
+		hr = XuiSceneCreate(szResourceLocator,app.GetSceneName(eUIScene_DebugSetCamera, false, false), nullptr, &hScene);
 		this->NavigateForward(hScene);
 		//app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugCreateSchematic);
 #endif
@@ -266,7 +266,7 @@ HRESULT CScene_DebugOverlay::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotify
 	if( hObjSource == m_setFov )
 	{
 		Minecraft *pMinecraft = Minecraft::GetInstance();
-		pMinecraft->gameRenderer->SetFovVal((float)pNotifyValueChangedData->nValue);
+		pMinecraft->gameRenderer->SetFovVal(static_cast<float>(pNotifyValueChangedData->nValue));
 	}
 	return S_OK;
 }
@@ -274,10 +274,10 @@ HRESULT CScene_DebugOverlay::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotify
 HRESULT CScene_DebugOverlay::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->level != NULL)
+	if(pMinecraft->level != nullptr)
 	{
 		m_setTime.SetValue( pMinecraft->level->getLevelData()->getTime() % 24000 );
-		m_setFov.SetValue( (int)pMinecraft->gameRenderer->GetFovVal());
+		m_setFov.SetValue( static_cast<int>(pMinecraft->gameRenderer->GetFovVal()));
 	}
 	return S_OK;
 }
@@ -286,9 +286,9 @@ void CScene_DebugOverlay::SetSpawnToPlayerPos()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	pMinecraft->level->getLevelData()->setXSpawn((int)pMinecraft->player->x);
-	pMinecraft->level->getLevelData()->setYSpawn((int)pMinecraft->player->y);
-	pMinecraft->level->getLevelData()->setZSpawn((int)pMinecraft->player->z);
+	pMinecraft->level->getLevelData()->setXSpawn(static_cast<int>(pMinecraft->player->x));
+	pMinecraft->level->getLevelData()->setYSpawn(static_cast<int>(pMinecraft->player->y));
+	pMinecraft->level->getLevelData()->setZSpawn(static_cast<int>(pMinecraft->player->z));
 }
 
 #ifndef _CONTENT_PACKAGE
@@ -301,14 +301,14 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
 	ConsoleSaveFile *currentSave = pMinecraft->level->getLevelStorage()->getSaveFile();
 
 	// With a size of 0 but a value in the data pointer we should create a new save
-	ConsoleSaveFileOriginal newSave( currentSave->getFilename(), NULL, 0, true );
+	ConsoleSaveFileOriginal newSave( currentSave->getFilename(), nullptr, 0, true );
 
 	// TODO Make this only happen for the new save
 	//SetSpawnToPlayerPos();
 	FileEntry *origFileEntry = currentSave->createFile( wstring( L"level.dat" ) );
 	byteArray levelData( origFileEntry->getFileSize() );
 	DWORD bytesRead;
-	currentSave->setFilePointer(origFileEntry,0,NULL,FILE_BEGIN);
+	currentSave->setFilePointer(origFileEntry,0,nullptr,FILE_BEGIN);
 	currentSave->readFile(
          origFileEntry,
          levelData.data, // data buffer
@@ -331,10 +331,10 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
 	{
 		for(int zPos = playerChunkZ - chunkRadius; zPos < playerChunkZ + chunkRadius; ++zPos)
 		{
-			CompoundTag *chunkData=NULL;
+			CompoundTag *chunkData=nullptr;
 
 			DataInputStream *is = RegionFileCache::getChunkDataInputStream(currentSave, L"", xPos, zPos);
-			if (is != NULL)
+			if (is != nullptr)
 			{
 				chunkData = NbtIo::read((DataInput *)is);
 				is->deleteChildStream();
@@ -342,7 +342,7 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
 			}
 			app.DebugPrintf("Processing chunk (%d, %d)\n", xPos, zPos);
 			DataOutputStream *os = getChunkDataOutputStream(newFileCache, &newSave, L"", xPos, zPos);
-			if(os != NULL)
+			if(os != nullptr)
 			{
 				NbtIo::write(chunkData, os);
 				os->close();
@@ -352,7 +352,7 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
 				os->deleteChildStream();
 				delete os;
 			}
-			if(chunkData != NULL)
+			if(chunkData != nullptr)
 			{
 				delete chunkData;
 			}
@@ -367,13 +367,13 @@ RegionFile *CScene_DebugOverlay::getRegionFile(unordered_map<File, RegionFile *,
 {
 	File file( prefix + wstring(L"r.") + std::to_wstring(chunkX>>5) + L"." + std::to_wstring(chunkZ>>5) + L".mcr" );
 
-	RegionFile *ref = NULL;
+	RegionFile *ref = nullptr;
     auto it = newFileCache.find(file);
     if( it != newFileCache.end() )
 		ref = it->second;
 
 	// 4J Jev, put back in.
-    if (ref != NULL)
+    if (ref != nullptr)
 	{
 		return ref;
     }
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
index f6335191..fb6339ce 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
@@ -25,7 +25,7 @@ HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled
 	currentPosition->player = playerNo;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if (pMinecraft != NULL)
+	if (pMinecraft != nullptr)
 	{
 		Vec3 *vec = pMinecraft->localplayers[playerNo]->getPos(1.0);
 
@@ -43,12 +43,12 @@ HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled
 	m_yRot.SetKeyboardType(C_4JInput::EKeyboardMode_Full);
 	m_elevation.SetKeyboardType(C_4JInput::EKeyboardMode_Full);
 
-	m_camX.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_camX).c_str());
-	m_camY.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_camY + 1.62).c_str());
-	m_camZ.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_camZ).c_str());
+	m_camX.SetText(static_cast<const WCHAR *>(std::to_wstring(currentPosition->m_camX).c_str()));
+	m_camY.SetText(static_cast<const WCHAR *>(std::to_wstring(currentPosition->m_camY + 1.62).c_str()));
+	m_camZ.SetText(static_cast<const WCHAR *>(std::to_wstring(currentPosition->m_camZ).c_str()));
 
-	m_yRot.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_yRot).c_str());
-	m_elevation.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_elev).c_str());
+	m_yRot.SetText(static_cast<const WCHAR *>(std::to_wstring(currentPosition->m_yRot).c_str()));
+	m_elevation.SetText(static_cast<const WCHAR *>(std::to_wstring(currentPosition->m_elev).c_str()));
 
 	//fpp = new FreezePlayerParam();
 	//fpp->player = playerNo;
@@ -94,7 +94,7 @@ HRESULT CScene_DebugSetCamera::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
 		NavigateBack();
 
 		//delete currentPosition;
-		//currentPosition = NULL;
+		//currentPosition = nullptr;
 
 		rfHandled = TRUE;
 		break;
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
index aaa3b06f..e8091bcb 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_DebugTips::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {	
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	m_bIgnoreInput = false;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
index f66c0d70..cc235915 100644
--- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
@@ -18,7 +18,7 @@ HRESULT CScene_FullscreenProgress::OnInit( XUIMessageInit* pInitData, BOOL& bHan
 
 	m_buttonConfirm.SetText( app.GetString( IDS_CONFIRM_OK ) );
 
-	LoadingInputParams *params = (LoadingInputParams *)pInitData->pvInitData;
+	LoadingInputParams *params = static_cast<LoadingInputParams *>(pInitData->pvInitData);
 
 	m_CompletionData = params->completionData;
 	m_iPad=params->completionData->iPad;
@@ -67,10 +67,10 @@ HRESULT CScene_FullscreenProgress::OnInit( XUIMessageInit* pInitData, BOOL& bHan
 // The framework calls this handler when the object is to be destroyed. 
 HRESULT CScene_FullscreenProgress::OnDestroy()
 {
-	if( thread != NULL && thread != INVALID_HANDLE_VALUE )
+	if( thread != nullptr && thread != INVALID_HANDLE_VALUE )
 		delete thread;
 
-	if( m_CompletionData != NULL )
+	if( m_CompletionData != nullptr )
 		delete m_CompletionData;
 
 	return S_OK;
@@ -86,7 +86,7 @@ HRESULT CScene_FullscreenProgress::OnKeyDown(XUIMessageInput* pInputData, BOOL&
 	case VK_PAD_B:
 	case VK_ESCAPE:		
 		// 4J-JEV: Fix for Xbox360 #162749 - TU17: Save Upload: Content: UI: Player is presented with non-functional Tooltips after the Upload Save For Xbox One is completed.
-		if( m_cancelFunc != NULL && !m_threadCompleted ) 
+		if( m_cancelFunc != nullptr && !m_threadCompleted ) 
 		{
 			m_cancelFunc( m_cancelFuncParam );
 			m_bWasCancelled=true;
@@ -201,7 +201,7 @@ HRESULT CScene_FullscreenProgress::OnTransitionStart( XUIMessageTransition *pTra
 HRESULT CScene_FullscreenProgress::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 {
 	int code = thread->GetExitCode();
-    DWORD exitcode = *((DWORD *)&code);
+    DWORD exitcode = *static_cast<DWORD *>(&code);
 
 	//app.DebugPrintf("CScene_FullscreenProgress Timer %d\n",pTimer->nId);
 
@@ -244,7 +244,7 @@ HRESULT CScene_FullscreenProgress::OnTimer( XUIMessageTimer *pTimer, BOOL& bHand
 
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
-				StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, IDS_CONNECTION_LOST_SERVER, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+				StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, IDS_CONNECTION_LOST_SERVER, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 			
 				app.NavigateToHomeMenu();
 				ui.UpdatePlayerBasePositions();
@@ -292,7 +292,7 @@ HRESULT CScene_FullscreenProgress::OnTimer( XUIMessageTimer *pTimer, BOOL& bHand
 						CXuiSceneBase::ShowOtherPlayersBaseScene(iPad, true);
 						// This just allows it to be shown
 						Minecraft *pMinecraft = Minecraft::GetInstance();
-						if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
+						if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
 						ui.UpdatePlayerBasePositions();
 					}
 					break;
diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
index 286f06a7..e188cbf6 100644
--- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
@@ -10,7 +10,7 @@
 
 HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 
@@ -33,7 +33,7 @@ HRESULT CXuiSceneHud::OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& bHa
 HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return S_OK;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return S_OK;
 
 	++m_tickCount;
 
@@ -145,7 +145,7 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 	if (pMinecraft->localgameModes[m_iPad]->canHurtPlayer())
 	{
 		int xpNeededForNextLevel = pMinecraft->localplayers[m_iPad]->getXpNeededForNextLevel();
-		int progress = (int)(pMinecraft->localplayers[m_iPad]->experienceProgress  *xpNeededForNextLevel);
+		int progress = static_cast<int>(pMinecraft->localplayers[m_iPad]->experienceProgress * xpNeededForNextLevel);
 
 		m_ExperienceProgress.SetShow(TRUE);
 		m_ExperienceProgress.SetRange(0,xpNeededForNextLevel);
@@ -196,11 +196,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Full
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(L"FullPoisonFlash",NULL,L"FullPoisonFlash");
+						m_healthIcon[icon].PlayVisualRange(L"FullPoisonFlash",nullptr,L"FullPoisonFlash");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(L"FullFlash",NULL,L"FullFlash");
+						m_healthIcon[icon].PlayVisualRange(L"FullFlash",nullptr,L"FullFlash");
 					}
 				}
 				else if (icon * 2 + 1 == iLastHealth || icon * 2 + 1 == iHealth)
@@ -208,17 +208,17 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Half
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(L"HalfPoisonFlash",NULL,L"HalfPoisonFlash");
+						m_healthIcon[icon].PlayVisualRange(L"HalfPoisonFlash",nullptr,L"HalfPoisonFlash");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(L"HalfFlash",NULL,L"HalfFlash");
+						m_healthIcon[icon].PlayVisualRange(L"HalfFlash",nullptr,L"HalfFlash");
 					}
 				}
 				else
 				{
 					// Empty
-					m_healthIcon[icon].PlayVisualRange(L"NormalFlash",NULL,L"NormalFlash");
+					m_healthIcon[icon].PlayVisualRange(L"NormalFlash",nullptr,L"NormalFlash");
 				}
 			}
 			else
@@ -228,11 +228,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Full
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(L"FullPoison",NULL,L"FullPoison");
+						m_healthIcon[icon].PlayVisualRange(L"FullPoison",nullptr,L"FullPoison");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(L"Full",NULL,L"Full");
+						m_healthIcon[icon].PlayVisualRange(L"Full",nullptr,L"Full");
 					}
 				}
 				else if (icon * 2 + 1 == iHealth)
@@ -240,24 +240,24 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Half
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(L"HalfPoison",NULL,L"HalfPoison");
+						m_healthIcon[icon].PlayVisualRange(L"HalfPoison",nullptr,L"HalfPoison");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(L"Half",NULL,L"Half");
+						m_healthIcon[icon].PlayVisualRange(L"Half",nullptr,L"Half");
 					}
 				}
 				else
 				{
 					// Empty
-					m_healthIcon[icon].PlayVisualRange(L"Normal",NULL,L"Normal");
+					m_healthIcon[icon].PlayVisualRange(L"Normal",nullptr,L"Normal");
 				}
 			}
 
 			float yo = 0;
 			if (iHealth <= 4)
 			{
-				yo = (float)m_random.nextInt(2) * (iGuiScale+1);
+				yo = static_cast<float>(m_random.nextInt(2)) * (iGuiScale+1);
 			}
 			if (icon == heartOffsetIndex)
 			{
@@ -288,11 +288,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Full
 					if(hasHungerEffect)
 					{
-						m_foodIcon[icon].PlayVisualRange(L"FullPoisonFlash",NULL,L"FullPoisonFlash");
+						m_foodIcon[icon].PlayVisualRange(L"FullPoisonFlash",nullptr,L"FullPoisonFlash");
 					}
 					else
 					{
-						m_foodIcon[icon].PlayVisualRange(L"FullFlash",NULL,L"FullFlash");
+						m_foodIcon[icon].PlayVisualRange(L"FullFlash",nullptr,L"FullFlash");
 					}
 				}
 				else if (icon * 2 + 1 == oldFood || icon * 2 + 1 == food)
@@ -300,17 +300,17 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Half
 					if(hasHungerEffect)
 					{
-						m_foodIcon[icon].PlayVisualRange(L"HalfPoisonFlash",NULL,L"HalfPoisonFlash");
+						m_foodIcon[icon].PlayVisualRange(L"HalfPoisonFlash",nullptr,L"HalfPoisonFlash");
 					}
 					else
 					{
-						m_foodIcon[icon].PlayVisualRange(L"HalfFlash",NULL,L"HalfFlash");
+						m_foodIcon[icon].PlayVisualRange(L"HalfFlash",nullptr,L"HalfFlash");
 					}
 				}
 				else
 				{
 					// Empty
-					m_foodIcon[icon].PlayVisualRange(L"NormalFlash",NULL,L"NormalFlash");
+					m_foodIcon[icon].PlayVisualRange(L"NormalFlash",nullptr,L"NormalFlash");
 				}
 			}
 			else
@@ -320,11 +320,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Full
 					if(hasHungerEffect)
 					{
-						m_foodIcon[icon].PlayVisualRange(L"FullPoison",NULL,L"FullPoison");
+						m_foodIcon[icon].PlayVisualRange(L"FullPoison",nullptr,L"FullPoison");
 					}
 					else
 					{
-						m_foodIcon[icon].PlayVisualRange(L"Full",NULL,L"Full");
+						m_foodIcon[icon].PlayVisualRange(L"Full",nullptr,L"Full");
 					}
 				}
 				else if (icon * 2 + 1 == food)
@@ -332,11 +332,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Half
 					if(hasHungerEffect)
 					{
-						m_foodIcon[icon].PlayVisualRange(L"HalfPoison",NULL,L"HalfPoison");
+						m_foodIcon[icon].PlayVisualRange(L"HalfPoison",nullptr,L"HalfPoison");
 					}
 					else
 					{
-						m_foodIcon[icon].PlayVisualRange(L"Half",NULL,L"Half");
+						m_foodIcon[icon].PlayVisualRange(L"Half",nullptr,L"Half");
 					}
 				}
 				else
@@ -344,11 +344,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Empty
 					if(hasHungerEffect)
 					{
-						m_foodIcon[icon].PlayVisualRange(L"NormalPoison",NULL,L"NormalPoison");
+						m_foodIcon[icon].PlayVisualRange(L"NormalPoison",nullptr,L"NormalPoison");
 					}
 					else
 					{
-						m_foodIcon[icon].PlayVisualRange(L"Normal",NULL,L"Normal");
+						m_foodIcon[icon].PlayVisualRange(L"Normal",nullptr,L"Normal");
 					}
 				}
 			}
@@ -359,7 +359,7 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 			{
 				if ((m_tickCount % (food * 3 + 1)) == 0)
 				{
-					yo = (float)(m_random.nextInt(3) - 1) * (iGuiScale+1);
+					yo = static_cast<float>(m_random.nextInt(3) - 1) * (iGuiScale+1);
 				}
 			}
 
@@ -377,9 +377,9 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 			m_armourGroup.SetShow(TRUE);
 			for (int icon = 0; icon < 10; icon++)
 			{
-				if (icon * 2 + 1 < armor) m_armourIcon[icon].PlayVisualRange(L"Full",NULL,L"Full");
-				else if (icon * 2 + 1 == armor) m_armourIcon[icon].PlayVisualRange(L"Half",NULL,L"Half");
-				else if (icon * 2 + 1 > armor) m_armourIcon[icon].PlayVisualRange(L"Normal",NULL,L"Normal");
+				if (icon * 2 + 1 < armor) m_armourIcon[icon].PlayVisualRange(L"Full",nullptr,L"Full");
+				else if (icon * 2 + 1 == armor) m_armourIcon[icon].PlayVisualRange(L"Half",nullptr,L"Half");
+				else if (icon * 2 + 1 > armor) m_armourIcon[icon].PlayVisualRange(L"Normal",nullptr,L"Normal");
 			}
 		}
 		else
@@ -391,20 +391,20 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 		if (pMinecraft->localplayers[m_iPad]->isUnderLiquid(Material::water))
 		{
 			m_airGroup.SetShow(TRUE);
-			int count = (int) ceil((pMinecraft->localplayers[m_iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY);
-			int extra = (int) ceil((pMinecraft->localplayers[m_iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY) - count;
+			int count = static_cast<int>(ceil((pMinecraft->localplayers[m_iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY));
+			int extra = static_cast<int>(ceil((pMinecraft->localplayers[m_iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY)) - count;
 			for (int icon = 0; icon < 10; icon++)
 			{
 				// Air bubbles
 				if (icon < count)
 				{
 					m_airIcon[icon].SetShow(TRUE);
-					m_airIcon[icon].PlayVisualRange(L"Bubble",NULL,L"Bubble");
+					m_airIcon[icon].PlayVisualRange(L"Bubble",nullptr,L"Bubble");
 				}
 				else if(icon < count + extra)
 				{
 					m_airIcon[icon].SetShow(TRUE);
-					m_airIcon[icon].PlayVisualRange(L"Pop",NULL,L"Pop");
+					m_airIcon[icon].PlayVisualRange(L"Pop",nullptr,L"Pop");
 				}
 				else m_airIcon[icon].SetShow(FALSE);
 			}
@@ -428,7 +428,7 @@ HRESULT CXuiSceneHud::OnCustomMessage_DLCInstalled()
 {
 	// mounted DLC may have changed
 	bool bPauseMenuDisplayed=false;
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
+	bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
 	// ignore this if we have menus up - they'll deal with it
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
index 9ba49e9d..f33d1d91 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
@@ -12,8 +12,8 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	MapChildControls();
 	XuiControlSetText(m_Buttons[BUTTON_HAO_CHANGESKIN],app.GetString(IDS_CHANGE_SKIN));
@@ -140,7 +140,7 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 
 /*HRESULT CScene_HelpAndOptions::OnTMSDLCFileRetrieved( )
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	m_Timer.SetShow(FALSE);
 	m_bIgnoreInput=false;
 
@@ -253,7 +253,7 @@ HRESULT CScene_HelpAndOptions::OnControlNavigate(XUIMessageControlNavigate *pCon
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -344,7 +344,7 @@ HRESULT CScene_HelpAndOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
 
 HRESULT CScene_HelpAndOptions::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	if(bNotInGame)
 	{
@@ -414,7 +414,7 @@ HRESULT CScene_HelpAndOptions::OnTransitionStart( XUIMessageTransition *pTransit
 
 		// 4J-PB - Going to resize buttons if the text is too big to fit on any of them (Br-pt problem with the length of Unlock Full Game)
 		XUIRect xuiRect;
-		HXUIOBJ visual=NULL;
+		HXUIOBJ visual=nullptr;
 		HXUIOBJ text;
 		float fMaxTextLen=0.0f;
 		float fTextVisualLen;
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
index e7a8b0ca..3c4e80a2 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
@@ -91,9 +91,9 @@ HRESULT CScene_Controls::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	XuiControlSetText(m_SouthPaw,app.GetString(IDS_SOUTHPAW));
 	XuiControlSetText(m_InvertLook,app.GetString(IDS_INVERT_LOOK));
 
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bSplitscreen=(app.GetLocalPlayerCount()>1);
 	m_iCurrentTextIndex=0;
 	m_bCreativeMode = !bNotInGame && Minecraft::GetInstance()->localplayers[m_iPad] && Minecraft::GetInstance()->localplayers[m_iPad]->abilities.mayfly;
@@ -159,20 +159,20 @@ HRESULT CScene_Controls::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 			controlDetailsA[i].vPos.y/=2.0f;
 		}
 		m_FigA[i].SetShow(FALSE);
-		m_TextPresenterA[i] = NULL;
+		m_TextPresenterA[i] = nullptr;
 	}
 
 	// fill out the layouts list
 	VOID *pObj;
 	XuiObjectFromHandle( m_SchemeList, &pObj );
-	m_pLayoutList = (CXuiCtrl4JList *)pObj;
+	m_pLayoutList = static_cast<CXuiCtrl4JList *>(pObj);
 	CXuiCtrl4JList::LIST_ITEM_INFO ListInfo[3];
 	ZeroMemory(ListInfo,sizeof(CXuiCtrl4JList::LIST_ITEM_INFO)*3);
 
 	for(int i=0;i<3;i++)
 	{
 		ListInfo[i].pwszText=m_LayoutNameA[i];
-		ListInfo[i].hXuiBrush=NULL;
+		ListInfo[i].hXuiBrush=nullptr;
 		ListInfo[i].fEnabled=TRUE;
 		m_pLayoutList->AddData(ListInfo[i]);
 	}
@@ -325,9 +325,9 @@ void CScene_Controls::PositionText(int iPad,int iTextID, unsigned char ucAction)
 	XuiElementGetScale(hFigGroup,&vScale);
 
 	// check the width of the control with the text set in it
-	if(m_TextPresenterA[m_iCurrentTextIndex]==NULL)
+	if(m_TextPresenterA[m_iCurrentTextIndex]==nullptr)
 	{
- 		HXUIOBJ hObj=NULL;
+ 		HXUIOBJ hObj=nullptr;
  		HRESULT hr=XuiControlGetVisual(m_TextA[m_iCurrentTextIndex].m_hObj,&hObj);
 		hr=XuiElementGetChildById(hObj,L"Text",&m_TextPresenterA[m_iCurrentTextIndex]);
 	}
@@ -452,9 +452,9 @@ void CScene_Controls::PositionTextDirect(int iPad,int iTextID, int iControlDetai
 	XuiElementGetScale(hFigGroup,&vScale);
 
 	// check the width of the control with the text set in it	
-	if(m_TextPresenterA[m_iCurrentTextIndex]==NULL)
+	if(m_TextPresenterA[m_iCurrentTextIndex]==nullptr)
 	{
- 		HXUIOBJ hObj=NULL;
+ 		HXUIOBJ hObj=nullptr;
  		HRESULT hr=XuiControlGetVisual(m_TextA[m_iCurrentTextIndex].m_hObj,&hObj);
 		hr=XuiElementGetChildById(hObj,L"Text",&m_TextPresenterA[m_iCurrentTextIndex]);
 	}
@@ -532,18 +532,18 @@ HRESULT CScene_Controls::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pN
 	if ( hObjPressed == m_InvertLook.m_hObj )
 	{
 		BOOL bIsChecked = m_InvertLook.IsChecked();
-		app.SetGameSettings(m_iPad,eGameSetting_ControlInvertLook,(unsigned char)( bIsChecked ) );
+		app.SetGameSettings(m_iPad,eGameSetting_ControlInvertLook,static_cast<unsigned char>(bIsChecked) );
 	}
 	else if ( hObjPressed == m_SouthPaw.m_hObj )
 	{
 		BOOL bIsChecked = m_SouthPaw.IsChecked();
-		app.SetGameSettings(m_iPad,eGameSetting_ControlSouthPaw,(unsigned char)( bIsChecked ) );
+		app.SetGameSettings(m_iPad,eGameSetting_ControlSouthPaw,static_cast<unsigned char>(bIsChecked) );
 		PositionAllText(m_iPad);
 	}
 	else if( hObjPressed == m_SchemeList)
 	{
 		// check what's been selected
-		app.SetGameSettings(m_iPad,eGameSetting_ControlScheme,(unsigned char)m_SchemeList.GetCurSel());
+		app.SetGameSettings(m_iPad,eGameSetting_ControlScheme,static_cast<unsigned char>(m_SchemeList.GetCurSel()));
 		LPWSTR layoutString = new wchar_t[ 128 ];
 		swprintf( layoutString, 128, L"%ls : %ls", app.GetString( IDS_CURRENT_LAYOUT ),app.GetString(m_iSchemeTextA[m_SchemeList.GetCurSel()]) );	
 		
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpCredits.cpp b/Minecraft.Client/Common/XUI/XUI_HelpCredits.cpp
index 4a6ce55f..c0584e94 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpCredits.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpCredits.cpp
@@ -386,12 +386,12 @@ static const int gs_aNumTextElements[ eNumTextTypes ] =
 //----------------------------------------------------------------------------------
 HRESULT CScene_Credits::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	int iPad = *(int *)pInitData->pvInitData;
+	int iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 
 	// if we're not in the game, we need to use basescene 0 
-	if(Minecraft::GetInstance()->level==NULL)
+	if(Minecraft::GetInstance()->level==nullptr)
 	{
 		iPad=0;
 	}
@@ -441,7 +441,7 @@ HRESULT CScene_Credits::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 			VOID* pTextObj;
 			XuiObjectFromHandle( text, &pTextObj );
-			m_aTextTypes[ i ].m_appTextElements[ j ] = (CXuiControl *)pTextObj;
+			m_aTextTypes[ i ].m_appTextElements[ j ] = static_cast<CXuiControl *>(pTextObj);
 			m_aTextTypes[ i ].m_appTextElements[ j ]->SetShow( false );
 		}
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
index 5c750d03..cd9e962d 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
@@ -39,12 +39,12 @@ static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 HRESULT CScene_HowToPlay::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	// Extract pad and required page from init data. We just put the data into the pointer rather than using it as an address.
-	size_t uiInitData = ( size_t )( pInitData->pvInitData );
+	size_t uiInitData = static_cast<size_t>(pInitData->pvInitData);
 
-	m_iPad = ( int )( ( short )( uiInitData & 0xFFFF ) );
-	EHowToPlayPage eStartPage = ( EHowToPlayPage )( ( uiInitData >> 16 ) & 0xFFF );		// Ignores MSB which is set to 1!
+	m_iPad = static_cast<int>((short)(uiInitData & 0xFFFF));
+	EHowToPlayPage eStartPage = static_cast<EHowToPlayPage>((uiInitData >> 16) & 0xFFF);		// Ignores MSB which is set to 1!
 
-	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, (ETelemetry_HowToPlay_SubMenuId)eStartPage);
+	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, static_cast<ETelemetry_HowToPlay_SubMenuId>(eStartPage));
 
 	MapChildControls();
 
@@ -116,10 +116,10 @@ HRESULT CScene_HowToPlay::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled
 	case VK_PAD_A:
 	{
 		// Next page
-		int iNextPage = ( int )( m_eCurrPage ) + 1;
+		int iNextPage = static_cast<int>(m_eCurrPage) + 1;
 		if ( iNextPage != eHowToPlay_NumPages )
 		{
-			StartPage( ( EHowToPlayPage )( iNextPage ) );
+			StartPage( static_cast<EHowToPlayPage>(iNextPage) );
 			CXuiSceneBase::PlayUISFX(eSFX_Press);
 		}
 		rfHandled = TRUE;
@@ -128,10 +128,10 @@ HRESULT CScene_HowToPlay::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled
 	case VK_PAD_X:
 	{
 		// Next page
-		int iPrevPage = ( int )( m_eCurrPage ) - 1;
+		int iPrevPage = static_cast<int>(m_eCurrPage) - 1;
 		if ( iPrevPage >= 0 )
 		{
-			StartPage( ( EHowToPlayPage )( iPrevPage ) );
+			StartPage( static_cast<EHowToPlayPage>(iPrevPage) );
 			CXuiSceneBase::PlayUISFX(eSFX_Press);
 		}
 		rfHandled = TRUE;
@@ -146,7 +146,7 @@ void CScene_HowToPlay::StartPage( EHowToPlayPage ePage )
 {
 	int iBaseSceneUser;
 	// if we're not in the game, we need to use basescene 0 
-	if(Minecraft::GetInstance()->level==NULL)
+	if(Minecraft::GetInstance()->level==nullptr)
 	{
 		iBaseSceneUser=DEFAULT_XUI_MENU_USER;
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
index 14046f20..a99921e0 100644
--- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
@@ -65,11 +65,11 @@ unsigned int CScene_HowToPlayMenu::m_uiHTPSceneA[]=
 //----------------------------------------------------------------------------------
 HRESULT CScene_HowToPlayMenu::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bSplitscreen= app.GetLocalPlayerCount()>1;
-	m_ButtonList=NULL;
+	m_ButtonList=nullptr;
 
 	//MapChildControls();
 
@@ -131,7 +131,7 @@ HRESULT CScene_HowToPlayMenu::OnGetSourceDataText(XUIMessageGetSourceText *pGetS
 {
 	if( pGetSourceTextData->bItemData )
 	{
-		if( pGetSourceTextData->iItem < (int)eHTPButton_Max )
+		if( pGetSourceTextData->iItem < static_cast<int>(eHTPButton_Max) )
 		{
 			pGetSourceTextData->szText = app.GetString(m_uiHTPButtonNameA[pGetSourceTextData->iItem]);//m_Buttons[pGetSourceTextData->iItem].GetText();
 			pGetSourceTextData->bDisplay = TRUE;
@@ -173,7 +173,7 @@ HRESULT CScene_HowToPlayMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPres
 	// 4J-PB - now using a list for all resolutions
 	//if((!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) || app.GetLocalPlayerCount()>1)
 	{
-		if(hObjPressed==m_ButtonList && m_ButtonList.TreeHasFocus() && (m_ButtonList.GetItemCount() > 0) && (m_ButtonList.GetCurSel() < (int)eHTPButton_Max) )
+		if(hObjPressed==m_ButtonList && m_ButtonList.TreeHasFocus() && (m_ButtonList.GetItemCount() > 0) && (m_ButtonList.GetCurSel() < static_cast<int>(eHTPButton_Max)) )
 		{
 			uiButtonCounter=m_ButtonList.GetCurSel();
 		}
@@ -186,7 +186,7 @@ HRESULT CScene_HowToPlayMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPres
 	// Determine which button was pressed,
 	// and call the appropriate function.
 
-	uiInitData = ( ( 1 <<  31 )  | ( m_uiHTPSceneA[uiButtonCounter]  << 16 ) | ( short )( m_iPad ) );
+	uiInitData = ( ( 1 <<  31 )  | ( m_uiHTPSceneA[uiButtonCounter]  << 16 ) | static_cast<short>(m_iPad) );
 	if(app.GetLocalPlayerCount()>1)
 	{
 		app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_HowToPlay, ( void* )( uiInitData ) );
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
index f0561745..5030a792 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
@@ -12,7 +12,7 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_InGameHostOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 
@@ -76,9 +76,9 @@ HRESULT CScene_InGameHostOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
 			{
 				Minecraft *pMinecraft = Minecraft::GetInstance();				
 				shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
-				if(player != NULL && player->connection)
+				if(player != nullptr && player->connection)
 				{
-					player->connection->send( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, hostOptions) ) );
+					player->connection->send(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, hostOptions));
 				}
 			}
 
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
index 4839013c..35e08339 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
@@ -25,7 +25,7 @@
 HRESULT CScene_InGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	m_bIgnoreKeyPresses=true;
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 
@@ -44,7 +44,7 @@ HRESULT CScene_InGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			m_players[i] = player->GetSmallId();
 			++m_playersCount;
@@ -55,7 +55,7 @@ HRESULT CScene_InGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -140,9 +140,9 @@ HRESULT CScene_InGameInfo::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
 		if(playersList.TreeHasFocus() && (playersList.GetItemCount() > 0) && (playersList.GetCurSel() < m_playersCount) )
 		{
 			INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId(m_players[playersList.GetCurSel()]);
-			if( player != NULL )
+			if( player != nullptr )
 			{
-				PlayerUID xuid = ((NetworkPlayerXbox *)player)->GetUID();
+				PlayerUID xuid = static_cast<NetworkPlayerXbox *>(player)->GetUID();
 				if( xuid != INVALID_XUID )
 					hr = XShowGamerCardUI(pInputData->UserIndex, xuid);
 			}
@@ -189,7 +189,7 @@ HRESULT CScene_InGameInfo::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 		bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
 		bool trust = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 
-		if( isOp && selectedPlayer != NULL && playersList.TreeHasFocus() && (playersList.GetItemCount() > 0) && (playersList.GetCurSel() < m_playersCount) )
+		if( isOp && selectedPlayer != nullptr && playersList.TreeHasFocus() && (playersList.GetItemCount() > 0) && (playersList.GetCurSel() < m_playersCount) )
 		{
 			bool editingHost = selectedPlayer->IsHost();
 			if( (cheats && (m_isHostPlayer || !editingHost ) )
@@ -268,7 +268,7 @@ HRESULT CScene_InGameInfo::OnNotifySetFocus( HXUIOBJ hObjSource, XUINotifyFocus
 
 void CScene_InGameInfo::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
-	CScene_InGameInfo *scene = (CScene_InGameInfo *)callbackParam;
+	CScene_InGameInfo *scene = static_cast<CScene_InGameInfo *>(callbackParam);
 	bool playerFound = false;
 
 	for(int i = 0; i < scene->m_playersCount; ++i)
@@ -311,7 +311,7 @@ HRESULT CScene_InGameInfo::OnGetSourceDataText(XUIMessageGetSourceText *pGetSour
 		if( pGetSourceTextData->iItem < m_playersCount )
 		{
 			INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId( m_players[pGetSourceTextData->iItem] );
-			if( player != NULL )
+			if( player != nullptr )
 			{
 #ifndef _CONTENT_PACKAGE
 				if(app.DebugSettingsOn() && (app.GetGameSettingsDebugMask()&(1L<<eDebugSetting_DebugLeaderboards)))
@@ -397,7 +397,7 @@ HRESULT CScene_InGameInfo::OnGetSourceDataText(XUIMessageGetSourceText *pGetSour
 			hr=XuiElementGetChildById(hVisual,L"VoiceGroup",&hVoiceIcon);
 
 			playFrame = -1;
-			if(player != NULL && player->HasVoice() )
+			if(player != nullptr && player->HasVoice() )
 			{
 				if( player->IsMutedByLocalUser(m_iPad) )
 				{
@@ -477,7 +477,7 @@ void CScene_InGameInfo::updateTooltips()
 		{
 			keyA = IDS_TOOLTIPS_SELECT;
 		}
-		else if( selectedPlayer != NULL)
+		else if( selectedPlayer != nullptr)
 		{
 			bool editingHost = selectedPlayer->IsHost();
 			if( (cheats && (m_isHostPlayer || !editingHost ) ) || (!trust && (m_isHostPlayer || !editingHost))
@@ -499,7 +499,7 @@ void CScene_InGameInfo::updateTooltips()
 	if(!m_gameOptionsButton.HasFocus())
 	{
 		// if the player is me, then view gamer profile
-		if(selectedPlayer != NULL && selectedPlayer->IsLocal() && selectedPlayer->GetUserIndex()==m_iPad)
+		if(selectedPlayer != nullptr && selectedPlayer->IsLocal() && selectedPlayer->GetUserIndex()==m_iPad)
 		{
 			ikeyY = IDS_TOOLTIPS_VIEW_GAMERPROFILE;
 		}
@@ -520,16 +520,16 @@ HRESULT CScene_InGameInfo::OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL
 
 int CScene_InGameInfo::KickPlayerReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	BYTE smallId = *(BYTE *)pParam;
+	BYTE smallId = *static_cast<BYTE *>(pParam);
 	delete pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{		
 		Minecraft *pMinecraft = Minecraft::GetInstance();
 		shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[iPad];
-		if(localPlayer != NULL && localPlayer->connection)
+		if(localPlayer != nullptr && localPlayer->connection)
 		{
-			localPlayer->connection->send( shared_ptr<KickPlayerPacket>( new KickPlayerPacket(smallId) ) );
+			localPlayer->connection->send(std::make_shared<KickPlayerPacket>(smallId));
 		}
 	}
 
diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
index 156cd092..4ab2a54a 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
@@ -16,9 +16,9 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_InGamePlayerOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
-	InGamePlayerOptionsInitData *initData = (InGamePlayerOptionsInitData *)pInitData->pvInitData;
+	InGamePlayerOptionsInitData *initData = static_cast<InGamePlayerOptionsInitData *>(pInitData->pvInitData);
 	m_iPad = initData->iPad;
 	m_networkSmallId = initData->networkSmallId;
 	m_playerPrivileges = initData->playerPrivileges;
@@ -32,14 +32,14 @@ HRESULT CScene_InGamePlayerOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHa
 	INetworkPlayer *localPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
 
-	if(editingPlayer != NULL)
+	if(editingPlayer != nullptr)
 	{
 		m_Gamertag.SetText(editingPlayer->GetOnlineName());
 	}
 
 	bool trustPlayers = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 	bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
-	m_editingSelf = (localPlayer != NULL && localPlayer == editingPlayer);
+	m_editingSelf = (localPlayer != nullptr && localPlayer == editingPlayer);
 
 	if( m_editingSelf || trustPlayers || editingPlayer->IsHost())
 	{
@@ -247,7 +247,7 @@ HRESULT CScene_InGamePlayerOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL&
 			else
 			{
 				INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
-				if(!trustPlayers && (editingPlayer != NULL && !editingPlayer->IsHost() ) )
+				if(!trustPlayers && (editingPlayer != nullptr && !editingPlayer->IsHost() ) )
 				{
 					Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CannotMine,!m_checkboxes[eControl_BuildAndMine].IsChecked());
 					Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CannotBuild,!m_checkboxes[eControl_BuildAndMine].IsChecked());
@@ -278,9 +278,9 @@ HRESULT CScene_InGamePlayerOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL&
 				// Send update settings packet to server
 				Minecraft *pMinecraft = Minecraft::GetInstance();				
 				shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
-				if(player != NULL && player->connection)
+				if(player != nullptr && player->connection)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( m_networkSmallId, -1, m_playerPrivileges) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(m_networkSmallId, -1, m_playerPrivileges));
 				}
 			}
 
@@ -320,7 +320,7 @@ HRESULT CScene_InGamePlayerOptions::OnControlNavigate(XUIMessageControlNavigate
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -330,16 +330,16 @@ HRESULT CScene_InGamePlayerOptions::OnControlNavigate(XUIMessageControlNavigate
 
 int CScene_InGamePlayerOptions::KickPlayerReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	BYTE smallId = *(BYTE *)pParam;
+	BYTE smallId = *static_cast<BYTE *>(pParam);
 	delete pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{		
 		Minecraft *pMinecraft = Minecraft::GetInstance();
 		shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[iPad];
-		if(localPlayer != NULL && localPlayer->connection)
+		if(localPlayer != nullptr && localPlayer->connection)
 		{
-			localPlayer->connection->send( shared_ptr<KickPlayerPacket>( new KickPlayerPacket(smallId) ) );
+			localPlayer->connection->send(std::make_shared<KickPlayerPacket>(smallId));
 		}
 
 		// Fix for #61494 - [CRASH]: TU7: Code: Multiplayer: Title may crash while kicking a player from an online game.
@@ -353,16 +353,16 @@ int CScene_InGamePlayerOptions::KickPlayerReturned(void *pParam,int iPad,C4JStor
 
 void CScene_InGamePlayerOptions::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
-	CScene_InGamePlayerOptions *scene = (CScene_InGamePlayerOptions *)callbackParam;
+	CScene_InGamePlayerOptions *scene = static_cast<CScene_InGamePlayerOptions *>(callbackParam);
 
 	HXUIOBJ hBackScene = scene->GetBackScene();
 	CScene_InGameInfo* infoScene;
 	VOID *pObj;
 	XuiObjectFromHandle( hBackScene, &pObj );
-	infoScene = (CScene_InGameInfo *)pObj;
-	if(infoScene != NULL) CScene_InGameInfo::OnPlayerChanged(infoScene,pPlayer,leaving);
+	infoScene = static_cast<CScene_InGameInfo *>(pObj);
+	if(infoScene != nullptr) CScene_InGameInfo::OnPlayerChanged(infoScene,pPlayer,leaving);
 
-	if(leaving && pPlayer != NULL && pPlayer->GetSmallId() == scene->m_networkSmallId)
+	if(leaving && pPlayer != nullptr && pPlayer->GetSmallId() == scene->m_networkSmallId)
 	{
 		app.NavigateBack(scene->m_iPad);
 	}
@@ -373,59 +373,59 @@ HRESULT CScene_InGamePlayerOptions::OnTransitionStart( XUIMessageTransition *pTr
 	if(pTransition->dwTransType == XUI_TRANSITION_TO || pTransition->dwTransType == XUI_TRANSITION_BACKTO)
 	{
 		INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
-		if(editingPlayer != NULL)
+		if(editingPlayer != nullptr)
 		{
 			short colourIndex = app.GetPlayerColour( m_networkSmallId );
 			switch(colourIndex)
 			{
 			case 1:
-				m_Icon.PlayVisualRange(L"P1",NULL,L"P1");
+				m_Icon.PlayVisualRange(L"P1",nullptr,L"P1");
 				break;
 			case 2:
-				m_Icon.PlayVisualRange(L"P2",NULL,L"P2");
+				m_Icon.PlayVisualRange(L"P2",nullptr,L"P2");
 				break;
 			case 3:
-				m_Icon.PlayVisualRange(L"P3",NULL,L"P3");
+				m_Icon.PlayVisualRange(L"P3",nullptr,L"P3");
 				break;
 			case 4:
-				m_Icon.PlayVisualRange(L"P4",NULL,L"P4");
+				m_Icon.PlayVisualRange(L"P4",nullptr,L"P4");
 				break;
 			case 5:
-				m_Icon.PlayVisualRange(L"P5",NULL,L"P5");
+				m_Icon.PlayVisualRange(L"P5",nullptr,L"P5");
 				break;
 			case 6:
-				m_Icon.PlayVisualRange(L"P6",NULL,L"P6");
+				m_Icon.PlayVisualRange(L"P6",nullptr,L"P6");
 				break;
 			case 7:
-				m_Icon.PlayVisualRange(L"P7",NULL,L"P7");
+				m_Icon.PlayVisualRange(L"P7",nullptr,L"P7");
 				break;
 			case 8:
-				m_Icon.PlayVisualRange(L"P8",NULL,L"P8");
+				m_Icon.PlayVisualRange(L"P8",nullptr,L"P8");
 				break;
 			case 9:
-				m_Icon.PlayVisualRange(L"P9",NULL,L"P9");
+				m_Icon.PlayVisualRange(L"P9",nullptr,L"P9");
 				break;
 			case 10:
-				m_Icon.PlayVisualRange(L"P10",NULL,L"P10");
+				m_Icon.PlayVisualRange(L"P10",nullptr,L"P10");
 				break;
 			case 11:
-				m_Icon.PlayVisualRange(L"P11",NULL,L"P11");
+				m_Icon.PlayVisualRange(L"P11",nullptr,L"P11");
 				break;
 			case 12:
-				m_Icon.PlayVisualRange(L"P12",NULL,L"P12");
+				m_Icon.PlayVisualRange(L"P12",nullptr,L"P12");
 				break;
 			case 13:
-				m_Icon.PlayVisualRange(L"P13",NULL,L"P13");
+				m_Icon.PlayVisualRange(L"P13",nullptr,L"P13");
 				break;
 			case 14:
-				m_Icon.PlayVisualRange(L"P14",NULL,L"P14");
+				m_Icon.PlayVisualRange(L"P14",nullptr,L"P14");
 				break;
 			case 15:
-				m_Icon.PlayVisualRange(L"P15",NULL,L"P15");
+				m_Icon.PlayVisualRange(L"P15",nullptr,L"P15");
 				break;
 			case 0:
 			default:
-				m_Icon.PlayVisualRange(L"P0",NULL,L"P0");
+				m_Icon.PlayVisualRange(L"P0",nullptr,L"P0");
 				break;
 			};
 		}
diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
index 428b3e88..7fde530b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
@@ -33,9 +33,9 @@ LPCWSTR CScene_Leaderboards::m_TextColumnNameA[7]=
 // if the value is greater than 511, it's an xzp icon that needs displayed, rather than the game icon
 const int CScene_Leaderboards::TitleIcons[CScene_Leaderboards::NUM_LEADERBOARDS][7] = 
 {
-	{ XZP_ICON_WALKED,		XZP_ICON_FALLEN,		Item::minecart_Id,		Item::boat_Id,					NULL },
+	{ XZP_ICON_WALKED,		XZP_ICON_FALLEN,		Item::minecart_Id,		Item::boat_Id,					nullptr },
 	{ Tile::dirt_Id,		Tile::stoneBrick_Id,	Tile::sand_Id,			Tile::rock_Id,			Tile::gravel_Id,		Tile::clay_Id,			Tile::obsidian_Id },
-	{ Item::egg_Id,			Item::wheat_Id,			Tile::mushroom1_Id,		Tile::reeds_Id,			Item::milk_Id,	Tile::pumpkin_Id,		NULL },
+	{ Item::egg_Id,			Item::wheat_Id,			Tile::mushroom1_Id,		Tile::reeds_Id,			Item::milk_Id,	Tile::pumpkin_Id,		nullptr },
 	{ XZP_ICON_ZOMBIE,		XZP_ICON_SKELETON,		XZP_ICON_CREEPER,		XZP_ICON_SPIDER,		XZP_ICON_SPIDERJOCKEY,	XZP_ICON_ZOMBIEPIGMAN,	XZP_ICON_SLIME },
 };
 
@@ -43,44 +43,44 @@ const int CScene_Leaderboards::LEADERBOARD_HEADERS[CScene_Leaderboards::NUM_LEAD
 	{ SPASTRING_LB_TRAVELLING_PEACEFUL_NAME,		SPASTRING_LB_TRAVELLING_EASY_NAME,		SPASTRING_LB_TRAVELLING_NORMAL_NAME,		SPASTRING_LB_TRAVELLING_HARD_NAME },
 	{ SPASTRING_LB_MINING_BLOCKS_PEACEFUL_NAME,		SPASTRING_LB_MINING_BLOCKS_EASY_NAME,	SPASTRING_LB_MINING_BLOCKS_NORMAL_NAME,		SPASTRING_LB_MINING_BLOCKS_HARD_NAME },
 	{ SPASTRING_LB_FARMING_PEACEFUL_NAME,			SPASTRING_LB_FARMING_EASY_NAME,			SPASTRING_LB_FARMING_NORMAL_NAME,			SPASTRING_LB_FARMING_HARD_NAME },
-	{ NULL,											SPASTRING_LB_KILLS_EASY_NAME,			SPASTRING_LB_KILLS_NORMAL_NAME,				SPASTRING_LB_KILLS_HARD_NAME },
+	{ nullptr,											SPASTRING_LB_KILLS_EASY_NAME,			SPASTRING_LB_KILLS_NORMAL_NAME,				SPASTRING_LB_KILLS_HARD_NAME },
 };
 
 const CScene_Leaderboards::LeaderboardDescriptor CScene_Leaderboards::LEADERBOARD_DESCRIPTORS[CScene_Leaderboards::NUM_LEADERBOARDS][4] = {
 	{
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_PEACEFUL, 4,	STATS_COLUMN_TRAVELLING_PEACEFUL_WALKED,	STATS_COLUMN_TRAVELLING_PEACEFUL_FALLEN,	STATS_COLUMN_TRAVELLING_PEACEFUL_MINECART,	STATS_COLUMN_TRAVELLING_PEACEFUL_BOAT,	NULL, NULL, NULL,NULL),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_EASY,		4,	STATS_COLUMN_TRAVELLING_EASY_WALKED,		STATS_COLUMN_TRAVELLING_EASY_FALLEN,		STATS_COLUMN_TRAVELLING_EASY_MINECART,		STATS_COLUMN_TRAVELLING_EASY_BOAT,		NULL, NULL, NULL,NULL),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_NORMAL,	4,	STATS_COLUMN_TRAVELLING_NORMAL_WALKED,		STATS_COLUMN_TRAVELLING_NORMAL_FALLEN,		STATS_COLUMN_TRAVELLING_NORMAL_MINECART,	STATS_COLUMN_TRAVELLING_NORMAL_BOAT,	NULL, NULL, NULL,NULL),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_HARD,		4,	STATS_COLUMN_TRAVELLING_HARD_WALKED,		STATS_COLUMN_TRAVELLING_HARD_FALLEN,		STATS_COLUMN_TRAVELLING_HARD_MINECART,		STATS_COLUMN_TRAVELLING_HARD_BOAT,		NULL, NULL, NULL,NULL),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_PEACEFUL, 4,	STATS_COLUMN_TRAVELLING_PEACEFUL_WALKED,	STATS_COLUMN_TRAVELLING_PEACEFUL_FALLEN,	STATS_COLUMN_TRAVELLING_PEACEFUL_MINECART,	STATS_COLUMN_TRAVELLING_PEACEFUL_BOAT,	nullptr, nullptr, nullptr,nullptr),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_EASY,		4,	STATS_COLUMN_TRAVELLING_EASY_WALKED,		STATS_COLUMN_TRAVELLING_EASY_FALLEN,		STATS_COLUMN_TRAVELLING_EASY_MINECART,		STATS_COLUMN_TRAVELLING_EASY_BOAT,		nullptr, nullptr, nullptr,nullptr),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_NORMAL,	4,	STATS_COLUMN_TRAVELLING_NORMAL_WALKED,		STATS_COLUMN_TRAVELLING_NORMAL_FALLEN,		STATS_COLUMN_TRAVELLING_NORMAL_MINECART,	STATS_COLUMN_TRAVELLING_NORMAL_BOAT,	nullptr, nullptr, nullptr,nullptr),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_TRAVELLING_HARD,		4,	STATS_COLUMN_TRAVELLING_HARD_WALKED,		STATS_COLUMN_TRAVELLING_HARD_FALLEN,		STATS_COLUMN_TRAVELLING_HARD_MINECART,		STATS_COLUMN_TRAVELLING_HARD_BOAT,		nullptr, nullptr, nullptr,nullptr),
 	},
 	{
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_PEACEFUL,	7,	STATS_COLUMN_MINING_BLOCKS_PEACEFUL_DIRT,  STATS_COLUMN_MINING_BLOCKS_PEACEFUL_STONE, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_SAND, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_GRAVEL, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_CLAY, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_OBSIDIAN,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_EASY,		7,	STATS_COLUMN_MINING_BLOCKS_EASY_DIRT,  STATS_COLUMN_MINING_BLOCKS_EASY_STONE, STATS_COLUMN_MINING_BLOCKS_EASY_SAND, STATS_COLUMN_MINING_BLOCKS_EASY_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_EASY_GRAVEL, STATS_COLUMN_MINING_BLOCKS_EASY_CLAY, STATS_COLUMN_MINING_BLOCKS_EASY_OBSIDIAN,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_NORMAL,	7,	STATS_COLUMN_MINING_BLOCKS_NORMAL_DIRT,  STATS_COLUMN_MINING_BLOCKS_NORMAL_STONE, STATS_COLUMN_MINING_BLOCKS_NORMAL_SAND, STATS_COLUMN_MINING_BLOCKS_NORMAL_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_NORMAL_GRAVEL, STATS_COLUMN_MINING_BLOCKS_NORMAL_CLAY, STATS_COLUMN_MINING_BLOCKS_NORMAL_OBSIDIAN,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_HARD,		7,	STATS_COLUMN_MINING_BLOCKS_HARD_DIRT,  STATS_COLUMN_MINING_BLOCKS_HARD_STONE, STATS_COLUMN_MINING_BLOCKS_HARD_SAND, STATS_COLUMN_MINING_BLOCKS_HARD_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_HARD_GRAVEL, STATS_COLUMN_MINING_BLOCKS_HARD_CLAY, STATS_COLUMN_MINING_BLOCKS_HARD_OBSIDIAN,NULL ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_PEACEFUL,	7,	STATS_COLUMN_MINING_BLOCKS_PEACEFUL_DIRT,  STATS_COLUMN_MINING_BLOCKS_PEACEFUL_STONE, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_SAND, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_GRAVEL, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_CLAY, STATS_COLUMN_MINING_BLOCKS_PEACEFUL_OBSIDIAN,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_EASY,		7,	STATS_COLUMN_MINING_BLOCKS_EASY_DIRT,  STATS_COLUMN_MINING_BLOCKS_EASY_STONE, STATS_COLUMN_MINING_BLOCKS_EASY_SAND, STATS_COLUMN_MINING_BLOCKS_EASY_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_EASY_GRAVEL, STATS_COLUMN_MINING_BLOCKS_EASY_CLAY, STATS_COLUMN_MINING_BLOCKS_EASY_OBSIDIAN,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_NORMAL,	7,	STATS_COLUMN_MINING_BLOCKS_NORMAL_DIRT,  STATS_COLUMN_MINING_BLOCKS_NORMAL_STONE, STATS_COLUMN_MINING_BLOCKS_NORMAL_SAND, STATS_COLUMN_MINING_BLOCKS_NORMAL_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_NORMAL_GRAVEL, STATS_COLUMN_MINING_BLOCKS_NORMAL_CLAY, STATS_COLUMN_MINING_BLOCKS_NORMAL_OBSIDIAN,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_MINING_BLOCKS_HARD,		7,	STATS_COLUMN_MINING_BLOCKS_HARD_DIRT,  STATS_COLUMN_MINING_BLOCKS_HARD_STONE, STATS_COLUMN_MINING_BLOCKS_HARD_SAND, STATS_COLUMN_MINING_BLOCKS_HARD_COBBLESTONE, STATS_COLUMN_MINING_BLOCKS_HARD_GRAVEL, STATS_COLUMN_MINING_BLOCKS_HARD_CLAY, STATS_COLUMN_MINING_BLOCKS_HARD_OBSIDIAN,nullptr ),
 	},
 	{
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_PEACEFUL,	6, STATS_COLUMN_FARMING_PEACEFUL_EGGS, STATS_COLUMN_FARMING_PEACEFUL_WHEAT, STATS_COLUMN_FARMING_PEACEFUL_MUSHROOMS, STATS_COLUMN_FARMING_PEACEFUL_SUGARCANE, STATS_COLUMN_FARMING_PEACEFUL_MILK, STATS_COLUMN_FARMING_PEACEFUL_PUMPKINS, NULL,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_EASY,		6, STATS_COLUMN_FARMING_EASY_EGGS, STATS_COLUMN_FARMING_PEACEFUL_WHEAT, STATS_COLUMN_FARMING_EASY_MUSHROOMS, STATS_COLUMN_FARMING_EASY_SUGARCANE, STATS_COLUMN_FARMING_EASY_MILK, STATS_COLUMN_FARMING_EASY_PUMPKINS, NULL,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_NORMAL,		6, STATS_COLUMN_FARMING_NORMAL_EGGS, STATS_COLUMN_FARMING_NORMAL_WHEAT, STATS_COLUMN_FARMING_NORMAL_MUSHROOMS, STATS_COLUMN_FARMING_NORMAL_SUGARCANE, STATS_COLUMN_FARMING_NORMAL_MILK, STATS_COLUMN_FARMING_NORMAL_PUMPKINS, NULL,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_HARD,		6, STATS_COLUMN_FARMING_HARD_EGGS, STATS_COLUMN_FARMING_HARD_WHEAT, STATS_COLUMN_FARMING_HARD_MUSHROOMS, STATS_COLUMN_FARMING_HARD_SUGARCANE, STATS_COLUMN_FARMING_HARD_MILK, STATS_COLUMN_FARMING_HARD_PUMPKINS, NULL,NULL ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_PEACEFUL,	6, STATS_COLUMN_FARMING_PEACEFUL_EGGS, STATS_COLUMN_FARMING_PEACEFUL_WHEAT, STATS_COLUMN_FARMING_PEACEFUL_MUSHROOMS, STATS_COLUMN_FARMING_PEACEFUL_SUGARCANE, STATS_COLUMN_FARMING_PEACEFUL_MILK, STATS_COLUMN_FARMING_PEACEFUL_PUMPKINS, nullptr,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_EASY,		6, STATS_COLUMN_FARMING_EASY_EGGS, STATS_COLUMN_FARMING_PEACEFUL_WHEAT, STATS_COLUMN_FARMING_EASY_MUSHROOMS, STATS_COLUMN_FARMING_EASY_SUGARCANE, STATS_COLUMN_FARMING_EASY_MILK, STATS_COLUMN_FARMING_EASY_PUMPKINS, nullptr,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_NORMAL,		6, STATS_COLUMN_FARMING_NORMAL_EGGS, STATS_COLUMN_FARMING_NORMAL_WHEAT, STATS_COLUMN_FARMING_NORMAL_MUSHROOMS, STATS_COLUMN_FARMING_NORMAL_SUGARCANE, STATS_COLUMN_FARMING_NORMAL_MILK, STATS_COLUMN_FARMING_NORMAL_PUMPKINS, nullptr,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_FARMING_HARD,		6, STATS_COLUMN_FARMING_HARD_EGGS, STATS_COLUMN_FARMING_HARD_WHEAT, STATS_COLUMN_FARMING_HARD_MUSHROOMS, STATS_COLUMN_FARMING_HARD_SUGARCANE, STATS_COLUMN_FARMING_HARD_MILK, STATS_COLUMN_FARMING_HARD_PUMPKINS, nullptr,nullptr ),
 	},
 	{
-		CScene_Leaderboards::LeaderboardDescriptor( NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_KILLS_EASY,		7, STATS_COLUMN_KILLS_EASY_ZOMBIES, STATS_COLUMN_KILLS_EASY_SKELETONS, STATS_COLUMN_KILLS_EASY_CREEPERS, STATS_COLUMN_KILLS_EASY_SPIDERS, STATS_COLUMN_KILLS_EASY_SPIDERJOCKEYS, STATS_COLUMN_KILLS_EASY_ZOMBIEPIGMEN, STATS_COLUMN_KILLS_EASY_SLIME,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_KILLS_NORMAL,	7, STATS_COLUMN_KILLS_NORMAL_ZOMBIES, STATS_COLUMN_KILLS_NORMAL_SKELETONS, STATS_COLUMN_KILLS_NORMAL_CREEPERS, STATS_COLUMN_KILLS_NORMAL_SPIDERS, STATS_COLUMN_KILLS_NORMAL_SPIDERJOCKEYS, STATS_COLUMN_KILLS_NORMAL_ZOMBIEPIGMEN, STATS_COLUMN_KILLS_NORMAL_SLIME,NULL ),
-		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_KILLS_HARD,		7, STATS_COLUMN_KILLS_HARD_ZOMBIES, STATS_COLUMN_KILLS_HARD_SKELETONS, STATS_COLUMN_KILLS_HARD_CREEPERS, STATS_COLUMN_KILLS_HARD_SPIDERS, STATS_COLUMN_KILLS_HARD_SPIDERJOCKEYS, STATS_COLUMN_KILLS_HARD_ZOMBIEPIGMEN, STATS_COLUMN_KILLS_HARD_SLIME,NULL ),
+		CScene_Leaderboards::LeaderboardDescriptor( nullptr, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_KILLS_EASY,		7, STATS_COLUMN_KILLS_EASY_ZOMBIES, STATS_COLUMN_KILLS_EASY_SKELETONS, STATS_COLUMN_KILLS_EASY_CREEPERS, STATS_COLUMN_KILLS_EASY_SPIDERS, STATS_COLUMN_KILLS_EASY_SPIDERJOCKEYS, STATS_COLUMN_KILLS_EASY_ZOMBIEPIGMEN, STATS_COLUMN_KILLS_EASY_SLIME,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_KILLS_NORMAL,	7, STATS_COLUMN_KILLS_NORMAL_ZOMBIES, STATS_COLUMN_KILLS_NORMAL_SKELETONS, STATS_COLUMN_KILLS_NORMAL_CREEPERS, STATS_COLUMN_KILLS_NORMAL_SPIDERS, STATS_COLUMN_KILLS_NORMAL_SPIDERJOCKEYS, STATS_COLUMN_KILLS_NORMAL_ZOMBIEPIGMEN, STATS_COLUMN_KILLS_NORMAL_SLIME,nullptr ),
+		CScene_Leaderboards::LeaderboardDescriptor( STATS_VIEW_KILLS_HARD,		7, STATS_COLUMN_KILLS_HARD_ZOMBIES, STATS_COLUMN_KILLS_HARD_SKELETONS, STATS_COLUMN_KILLS_HARD_CREEPERS, STATS_COLUMN_KILLS_HARD_SPIDERS, STATS_COLUMN_KILLS_HARD_SPIDERJOCKEYS, STATS_COLUMN_KILLS_HARD_ZOMBIEPIGMEN, STATS_COLUMN_KILLS_HARD_SLIME,nullptr ),
 	},
 };
 
 HRESULT CScene_Leaderboards::OnInit(XUIMessageInit *pInitData, BOOL &bHandled)
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 	MapChildControls();
 	m_bReady=false;
 
 	// if we're not in the game, we need to use basescene 0 
-	if(Minecraft::GetInstance()->level==NULL)
+	if(Minecraft::GetInstance()->level==nullptr)
 	{
 		m_iPad=DEFAULT_XUI_MENU_USER;
 	}
@@ -90,9 +90,9 @@ HRESULT CScene_Leaderboards::OnInit(XUIMessageInit *pInitData, BOOL &bHandled)
 	ui.SetTooltips(m_iPad,-1, IDS_TOOLTIPS_BACK, IDS_TOOLTIPS_CHANGE_FILTER, -1);
 	CXuiSceneBase::ShowLogo( m_iPad, FALSE );
 
-	m_friends = NULL;
+	m_friends = nullptr;
 	m_numFriends = 0;
-	m_filteredFriends = NULL;
+	m_filteredFriends = nullptr;
 	m_numFilteredFriends = 0;
 
 	m_newTop = m_newSel = -1;
@@ -124,10 +124,10 @@ HRESULT CScene_Leaderboards::OnInit(XUIMessageInit *pInitData, BOOL &bHandled)
 	// title icons
 	for(int i=0;i<7;i++)
 	{
-		m_pHTitleIconSlots[i]=NULL;
+		m_pHTitleIconSlots[i]=nullptr;
 		m_fTitleIconXPositions[i]=0.0f;
 		m_fTextXPositions[i]=0.0f;
-		m_hTextEntryA[i]=NULL;
+		m_hTextEntryA[i]=nullptr;
 	}
 
 
@@ -143,13 +143,13 @@ void CScene_Leaderboards::Reposition(int iNumber)
 	D3DXVECTOR3 vPos;
 
 	fIconSize=(m_fTitleIconXPositions[6]-m_fTitleIconXPositions[0])/6.0f;
-	fNewIconIncrement=(fIconSize*7.0f)/(float)iNumber;
+	fNewIconIncrement=(fIconSize*7.0f)/static_cast<float>(iNumber);
 
 	// reposition the title icons based on the number there are
 	for(int i=0;i<iNumber;i++)
 	{
 		m_pHTitleIconSlots[i]->GetPosition(&vPos);
-		vPos.x=m_fTitleIconXPositions[0]+(((float)i)*fNewIconIncrement)+(fNewIconIncrement-fIconSize)/2.0f;
+		vPos.x=m_fTitleIconXPositions[0]+(static_cast<float>(i)*fNewIconIncrement)+(fNewIconIncrement-fIconSize)/2.0f;
 		m_pHTitleIconSlots[i]->SetPosition(&vPos);
 	}
 }
@@ -161,14 +161,14 @@ void CScene_Leaderboards::RepositionText(int iNumber)
 	D3DXVECTOR3 vPos;
 
 	fTextSize=(m_fTextXPositions[6]-m_fTextXPositions[0])/6.0f;
-	fNewTextIncrement=(fTextSize*7.0f)/(float)iNumber;
+	fNewTextIncrement=(fTextSize*7.0f)/static_cast<float>(iNumber);
 
 	// reposition the title icons based on the number there are
 	for(int i=0;i<iNumber;i++)
 	{
 		// and reposition the text
 		XuiElementGetPosition(m_hTextEntryA[i],&vPos);
-		vPos.x=m_fTextXPositions[0]+(((float)i)*fNewTextIncrement);
+		vPos.x=m_fTextXPositions[0]+(static_cast<float>(i)*fNewTextIncrement);
 		XuiElementSetPosition(m_hTextEntryA[i],&vPos);
 		// and change the size
 		float fWidth,fHeight;
@@ -190,10 +190,10 @@ HRESULT CScene_Leaderboards::OnDestroy()
 		Sleep( 10 );
 	}
 
-	if( m_friends != NULL )
+	if( m_friends != nullptr )
 		delete [] m_friends;
 
-	if( m_filteredFriends != NULL )
+	if( m_filteredFriends != nullptr )
 		delete [] m_filteredFriends;
 
 	return S_OK;
@@ -222,7 +222,7 @@ void CScene_Leaderboards::UpdateTooltips()
 	int iTooltipGamerCardOrProfile=-1;
 	if( m_leaderboard.m_currentEntryCount > 0 )
 	{
-		unsigned int selection = (unsigned int)m_listGamers.GetCurSel();
+		unsigned int selection = static_cast<unsigned int>(m_listGamers.GetCurSel());
 
 		// if the selected user is me, don't show Send Friend Request, and show the gamer profile, not the gamer card
 
@@ -368,7 +368,7 @@ HRESULT CScene_Leaderboards::OnKeyDown(XUIMessageInput* pInputData, BOOL& bHandl
 				else
 				{
 					m_newTop = m_listGamers.GetTopItem() + 10;
-					if( m_newTop+10 > (int)m_leaderboard.m_totalEntryCount )
+					if( m_newTop+10 > static_cast<int>(m_leaderboard.m_totalEntryCount) )
 					{
 						m_newTop = m_leaderboard.m_totalEntryCount - 10;
 						if( m_newTop < 0 )
@@ -426,7 +426,7 @@ HRESULT CScene_Leaderboards::OnKeyDown(XUIMessageInput* pInputData, BOOL& bHandl
 			//Show gamercard
 			if( m_leaderboard.m_currentEntryCount > 0 )
 			{
-				unsigned int selection = (unsigned int)m_listGamers.GetCurSel();
+				unsigned int selection = static_cast<unsigned int>(m_listGamers.GetCurSel());
 				if( selection >= m_leaderboard.m_entryStartIndex-1 &&
 					selection < (m_leaderboard.m_entryStartIndex+m_leaderboard.m_currentEntryCount-1) )
 				{
@@ -448,7 +448,7 @@ HRESULT CScene_Leaderboards::OnKeyDown(XUIMessageInput* pInputData, BOOL& bHandl
 			{
 				if( m_leaderboard.m_currentEntryCount > 0 )
 				{
-					unsigned int selection = (unsigned int)m_listGamers.GetCurSel();
+					unsigned int selection = static_cast<unsigned int>(m_listGamers.GetCurSel());
 					if( selection >= m_leaderboard.m_entryStartIndex-1 &&
 						selection < (m_leaderboard.m_entryStartIndex+m_leaderboard.m_currentEntryCount-1) )
 					{
@@ -511,7 +511,7 @@ void CScene_Leaderboards::GetFriends()
 		m_friends,
 		resultsSize,
 		&numFriends,
-		NULL );
+		nullptr );
 
 	if( ret != ERROR_SUCCESS )
 		numFriends = 0;
@@ -547,7 +547,7 @@ void CScene_Leaderboards::ReadStats(int startIndex)
 	}
 	else
 	{
-		m_newEntryIndex = (unsigned int)startIndex;
+		m_newEntryIndex = static_cast<unsigned int>(startIndex);
 		m_newReadSize	= min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1));
 	}
 
@@ -574,20 +574,20 @@ void CScene_Leaderboards::ReadStats(int startIndex)
 	{
 	case LeaderboardManager::eFM_TopRank:
 		LeaderboardManager::Instance()->ReadStats_TopRank(	this, 
-															m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard, 
+															m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard), 
 															m_newEntryIndex, m_newReadSize
 														 );
 		break;
 	case LeaderboardManager::eFM_MyScore:
 		LeaderboardManager::Instance()->ReadStats_MyScore(	this,
-															m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard,
+															m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard),
 															INVALID_XUID/*ignored*/, 
 															m_newReadSize
 														 );
 		break;
 	case LeaderboardManager::eFM_Friends:
 		LeaderboardManager::Instance()->ReadStats_Friends(	this,
-															m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard,
+															m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard),
 															INVALID_XUID /*ignored*/,
 															0 /*ignored*/, 0 /*ignored*/
 														 );
@@ -660,7 +660,7 @@ bool CScene_Leaderboards::RetrieveStats()
 				else
 				{
 					m_leaderboard.m_entries[entryIndex].m_columns[i] = UINT_MAX;
-					swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], 12, L"%.1fkm", ((float)m_leaderboard.m_entries[entryIndex].m_columns[i])/100.f/1000.f);
+					swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], 12, L"%.1fkm", static_cast<float>(m_leaderboard.m_entries[entryIndex].m_columns[i])/100.f/1000.f);
 				}
 			}
 
@@ -675,7 +675,7 @@ bool CScene_Leaderboards::RetrieveStats()
 		return true;
 	}
 
-	//assert( LeaderboardManager::Instance()->GetStats() != NULL );
+	//assert( LeaderboardManager::Instance()->GetStats() != nullptr );
 	//PXUSER_STATS_READ_RESULTS stats = LeaderboardManager::Instance()->GetStats();
 	//if( m_currentFilter == LeaderboardManager::eFM_Friends  )	LeaderboardManager::Instance()->SortFriendStats();
 
@@ -822,7 +822,7 @@ HRESULT CScene_Leaderboards::OnGetSourceDataText(XUIMessageGetSourceText *pGetSo
 				int readIndex = m_leaderboard.m_entryStartIndex - READ_SIZE;
 				if( readIndex <= 0 )
 					readIndex = 1;
-				assert( readIndex >= 1 && readIndex <= (int)m_leaderboard.m_totalEntryCount );
+                assert( readIndex >= 1 && readIndex <= static_cast<int>(m_leaderboard.m_totalEntryCount));
 				ReadStats(readIndex);
 			}
 		}
@@ -831,7 +831,7 @@ HRESULT CScene_Leaderboards::OnGetSourceDataText(XUIMessageGetSourceText *pGetSo
 			if( LeaderboardManager::Instance()->isIdle() )
 			{
 				int readIndex = m_leaderboard.m_entryStartIndex + m_leaderboard.m_currentEntryCount;
-				assert( readIndex >= 1 && readIndex <= (int)m_leaderboard.m_totalEntryCount );
+                assert( readIndex >= 1 && readIndex <= static_cast<int>(m_leaderboard.m_totalEntryCount));
 				ReadStats(readIndex);
 			}
 		}
@@ -850,7 +850,7 @@ HRESULT CScene_Leaderboards::OnGetSourceDataText(XUIMessageGetSourceText *pGetSo
 			}
 			else if( pGetSourceTextData->iData >= 3 && pGetSourceTextData->iData <= 9 )
 			{
-				if( m_leaderboard.m_numColumns <= (unsigned int)(pGetSourceTextData->iData-3) )
+				if( m_leaderboard.m_numColumns <= static_cast<unsigned int>(pGetSourceTextData->iData - 3) )
 					pGetSourceTextData->szText = L"";
 				else
 					pGetSourceTextData->szText = m_leaderboard.m_entries[index].m_wcColumns[pGetSourceTextData->iData-3];
@@ -898,11 +898,11 @@ HRESULT CScene_Leaderboards::OnGetSourceDataImage(XUIMessageGetSourceImage* pGet
 void CScene_Leaderboards::PopulateLeaderboard(bool noResults)
 {
 	HRESULT hr;
-	HXUIOBJ visual=NULL;
-	HXUIOBJ hTemp=NULL;
+	HXUIOBJ visual=nullptr;
+	HXUIOBJ hTemp=nullptr;
 	hr=XuiControlGetVisual(m_listGamers.m_hObj,&visual);
 
-	if(m_pHTitleIconSlots[0]==NULL)
+	if(m_pHTitleIconSlots[0]==nullptr)
 	{	
 		VOID *pObj;
 		HXUIOBJ button;
@@ -914,7 +914,7 @@ void CScene_Leaderboards::PopulateLeaderboard(bool noResults)
 			hr=XuiElementGetChildById(visual,m_TitleIconNameA[i],&button);
 
 			XuiObjectFromHandle( button, &pObj );
-			m_pHTitleIconSlots[i] = (CXuiCtrlCraftIngredientSlot *)pObj;
+			m_pHTitleIconSlots[i] = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
 
 			// store the default position, since we'll be repositioning these depending on how many are valid for each board
 			m_pHTitleIconSlots[i]->GetPosition(&vPos);
@@ -964,7 +964,7 @@ void CScene_Leaderboards::PopulateLeaderboard(bool noResults)
 		// Really only the newly updated rows need changed, but this shouldn't cause any performance issues
 		for(DWORD i = m_leaderboard.m_entryStartIndex - 1; i < (m_leaderboard.m_entryStartIndex - 1) + m_leaderboard.m_currentEntryCount; ++i)
 		{	
-			HXUIOBJ visual=NULL;
+			HXUIOBJ visual=nullptr;
 			HXUIOBJ button;
 			D3DXVECTOR3 vPos;
 			// 4J-PB - fix for #13768 - Leaderboards: Player scores appear misaligned when viewed under the "My Score" leaderboard filter
@@ -1088,24 +1088,24 @@ void CScene_Leaderboards::CopyLeaderboardEntry(PXUSER_STATS_ROW statsRow, Leader
 			else if(iDigitC<8)
 			{
 				// km with a .X
-				swprintf_s(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				swprintf_s(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #ifdef _DEBUG
-				app.DebugPrintf("Display - %.1fkm\n", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				app.DebugPrintf("Display - %.1fkm\n", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #endif
 			}
 			else
 			{
 				// bigger than that, so no decimal point
-				swprintf_s(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				swprintf_s(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #ifdef _DEBUG
-				app.DebugPrintf("Display - %.0fkm\n", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				app.DebugPrintf("Display - %.0fkm\n", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #endif
 			}
 		}
 	}
 
 	//Is the player
-	if( statsRow->xuid == ((XboxLeaderboardManager*)LeaderboardManager::Instance())->GetMyXUID() )
+	if( statsRow->xuid == static_cast<XboxLeaderboardManager *>(LeaderboardManager::Instance())->GetMyXUID() )
 	{
 		leaderboardEntry->m_bPlayer = true;
 		leaderboardEntry->m_bOnline = false;
@@ -1150,7 +1150,7 @@ void CScene_Leaderboards::SetLeaderboardHeader()
 	WCHAR buffer[40];
 	DWORD bufferLength = 40;
 
-	DWORD ret = XResourceGetString(LEADERBOARD_HEADERS[m_currentLeaderboard][m_currentDifficulty], buffer, &bufferLength, NULL);
+	DWORD ret = XResourceGetString(LEADERBOARD_HEADERS[m_currentLeaderboard][m_currentDifficulty], buffer, &bufferLength, nullptr);
 
 	if( ret == ERROR_SUCCESS )
 		m_textLeaderboard.SetText(buffer);
@@ -1184,8 +1184,8 @@ void CScene_Leaderboards::ClearLeaderboardTitlebar()
 		m_pHTitleIconSlots[i]->SetShow(FALSE);
 	}
 
-	HXUIOBJ visual=NULL;
-	HXUIOBJ hTemp=NULL;
+	HXUIOBJ visual=nullptr;
+	HXUIOBJ hTemp=nullptr;
 	HRESULT hr;
 	hr=XuiControlGetVisual(m_listGamers.m_hObj,&visual);
 
diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
index 7f32ff89..e1295795 100644
--- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
@@ -42,14 +42,14 @@ int CScene_LoadGameSettings::m_iDifficultyTitleSettingA[4]=
 
 HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_hXuiBrush = NULL;
+	m_hXuiBrush = nullptr;
 	m_bSetup = false;
 	m_texturePackDescDisplayed = false;
-	m_iConfigA=NULL;
+	m_iConfigA=nullptr;
 
 	WCHAR TempString[256];
 
-	m_params = (LoadMenuInitData *)pInitData->pvInitData;
+	m_params = static_cast<LoadMenuInitData *>(pInitData->pvInitData);
 
 	m_MoreOptionsParams.bGenerateOptions=FALSE;
 	m_MoreOptionsParams.bPVP = TRUE;
@@ -146,7 +146,7 @@ HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandl
 	else
 	{
 		// set the save icon
-		PBYTE pbImageData=NULL;
+		PBYTE pbImageData=nullptr;
 		DWORD dwImageBytes=0;
 
 		StorageManager.GetSaveCacheFileInfo(m_params->iSaveGameInfoIndex,m_XContentData);
@@ -156,13 +156,13 @@ HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandl
 		// Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save
 		bool bHostOptionsRead = false;
 		unsigned int uiHostOptions = 0;
-		if(pbImageData==NULL)
+		if(pbImageData==nullptr)
 		{
-			DWORD dwResult=XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&m_XContentData,NULL,&dwImageBytes,NULL);
+			DWORD dwResult=XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&m_XContentData,nullptr,&dwImageBytes,nullptr);
 			if(dwResult==ERROR_SUCCESS)
 			{
 				pbImageData = new BYTE[dwImageBytes];
-				XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&m_XContentData,pbImageData,&dwImageBytes,NULL);
+				XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&m_XContentData,pbImageData,&dwImageBytes,nullptr);
 				XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&m_hXuiBrush);
 			}
 		}
@@ -175,9 +175,9 @@ HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandl
 
 // #ifdef _DEBUG
 // 			// dump out the thumbnail
-// 			HANDLE hThumbnail = CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
+// 			HANDLE hThumbnail = CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, nullptr);
 // 			DWORD dwBytes;
-// 			WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,NULL);
+// 			WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,nullptr);
 // 			XCloseHandle(hThumbnail);
 // #endif
 
@@ -276,7 +276,7 @@ HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandl
 			if(dwImageBytes > 0 && pbImageData)
 			{
 				ListInfo.fEnabled = TRUE;			
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tp;
+				DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tp);
 				if(pDLCTexPack)
 				{
 					int id=pDLCTexPack->getDLCParentPackId();
@@ -310,7 +310,7 @@ HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandl
 
 
 		// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
-		DLC_INFO *pDLCInfo=NULL;
+		DLC_INFO *pDLCInfo=nullptr;
 
 		// first pass - look to see if there are any that are not in the list
 		bool bTexturePackAlreadyListed;
@@ -376,7 +376,7 @@ HRESULT CScene_LoadGameSettings::OnControlNavigate(XUIMessageControlNavigate *pC
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -411,7 +411,7 @@ HRESULT CScene_LoadGameSettings::LaunchGame(void)
 					// inform them that leaderboard writes and achievements will be disabled
 					//StorageManager.RequestMessageBox(IDS_TITLE_START_GAME, IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE, uiIDA, 1, m_iPad,&CScene_LoadGameSettings::ConfirmLoadReturned,this,app.GetStringTable());
 					
-					if(m_levelGen != NULL)
+					if(m_levelGen != nullptr)
 					{
 						LoadLevelGen(m_levelGen);
 					}
@@ -445,7 +445,7 @@ HRESULT CScene_LoadGameSettings::LaunchGame(void)
 	}
 	else
 	{
-		if(m_levelGen != NULL)
+		if(m_levelGen != nullptr)
 		{
 			LoadLevelGen(m_levelGen);
 		}
@@ -469,7 +469,7 @@ HRESULT CScene_LoadGameSettings::LaunchGame(void)
 
 int CScene_LoadGameSettings::CheckResetNetherReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_LoadGameSettings* pClass = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -503,7 +503,7 @@ HRESULT CScene_LoadGameSettings::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyP
 			// texture pack hasn't been set yet, so check what it will be
 			TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 
-			if(pTexturePack==NULL)
+			if(pTexturePack==nullptr)
 			{
 				// They've selected a texture pack they don't have yet
 				// upsell
@@ -572,7 +572,7 @@ HRESULT CScene_LoadGameSettings::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyP
 			// texture pack hasn't been set yet, so check what it will be
 			TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 			
-			if(pTexturePack==NULL)
+			if(pTexturePack==nullptr)
 			{
 				// DLC corrupt, so use the default textures
 				m_MoreOptionsParams.dwTexturePack=0;
@@ -600,7 +600,7 @@ HRESULT CScene_LoadGameSettings::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyP
 						DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_pDLCPack->getPurchaseOfferId());
 						ULONGLONG ullOfferID_Full;
 
-						if(pDLCInfo!=NULL)
+						if(pDLCInfo!=nullptr)
 						{
 							ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 						}
@@ -703,11 +703,11 @@ HRESULT CScene_LoadGameSettings::OnFontRendererChange()
 
 int CScene_LoadGameSettings::ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_LoadGameSettings* pClass = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
-		if(pClass->m_levelGen != NULL)
+		if(pClass->m_levelGen != nullptr)
 		{
 			pClass->LoadLevelGen(pClass->m_levelGen);
 		}
@@ -784,14 +784,14 @@ HRESULT CScene_LoadGameSettings::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandle
 				if(m_iConfigA[i]!=-1)
 				{
 					DWORD dwBytes=0;
-					PBYTE pbData=NULL;
+					PBYTE pbData=nullptr;
 					app.GetTPD(m_iConfigA[i],&pbData,&dwBytes);
 
 					ZeroMemory(&ListInfo,sizeof(CXuiCtrl4JList::LIST_ITEM_INFO));
 					if(dwBytes > 0 && pbData)
 					{
 						DWORD dwImageBytes=0;
-						PBYTE pbImageData=NULL;
+						PBYTE pbImageData=nullptr;
 
 						app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes );
 						ListInfo.fEnabled = TRUE;	
@@ -840,7 +840,7 @@ int CScene_LoadGameSettings::Progress(void *pParam,float fProgress)
 
 int CScene_LoadGameSettings::LoadSaveDataReturned(void *pParam,bool bContinue)
 {
-	CScene_LoadGameSettings* pClass = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -868,7 +868,7 @@ int CScene_LoadGameSettings::LoadSaveDataReturned(void *pParam,bool bContinue)
 				pClass->m_bIgnoreInput=false;
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
-				StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+				StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 			}
 			else
 			{
@@ -903,7 +903,7 @@ int CScene_LoadGameSettings::LoadSaveDataReturned(void *pParam,bool bContinue)
 
 int CScene_LoadGameSettings::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_LoadGameSettings* pClass = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -921,7 +921,7 @@ int CScene_LoadGameSettings::DeleteSaveDialogReturned(void *pParam,int iPad,C4JS
 
 int CScene_LoadGameSettings::DeleteSaveDataReturned(void *pParam,bool bSuccess)
 {
-	CScene_LoadGameSettings* pClass = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	app.SetCorruptSaveDeleted(true);
 	app.NavigateBack(pClass->m_iPad);
@@ -951,7 +951,7 @@ void CScene_LoadGameSettings::StartGameFromSave(CScene_LoadGameSettings* pClass,
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = 0;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->texturePackId = pClass->m_MoreOptionsParams.dwTexturePack;
 	
 	Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -983,7 +983,7 @@ void CScene_LoadGameSettings::StartGameFromSave(CScene_LoadGameSettings* pClass,
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave timer
 	app.SetAutosaveTimerTime();
@@ -1000,7 +1000,7 @@ void CScene_LoadGameSettings::StartGameFromSave(CScene_LoadGameSettings* pClass,
 
 int CScene_LoadGameSettings::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	CScene_LoadGameSettings* pClass = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -1036,7 +1036,7 @@ int CScene_LoadGameSettings::StartGame_SignInReturned(void *pParam,bool bContinu
 					//pClass->m_bAbortSearch=false;
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+					StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 				}
 				else
 				{
@@ -1045,7 +1045,7 @@ int CScene_LoadGameSettings::StartGame_SignInReturned(void *pParam,bool bContinu
 					//pClass->m_bAbortSearch=false;
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+					StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 				}
 			}
 			else
@@ -1082,7 +1082,7 @@ HRESULT CScene_LoadGameSettings::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINo
 	if(hObjSource==m_SliderDifficulty.GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_Difficulty,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue]));		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue]));		
 		m_SliderDifficulty.SetText(TempString);
 	}
 	return S_OK;
@@ -1150,7 +1150,7 @@ HRESULT CScene_LoadGameSettings::OnTransitionEnd( XUIMessageTransition *pTransit
 
 int CScene_LoadGameSettings::UnlockTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_LoadGameSettings* pScene = (CScene_LoadGameSettings*)pParam;
+	CScene_LoadGameSettings* pScene = static_cast<CScene_LoadGameSettings *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -1159,7 +1159,7 @@ int CScene_LoadGameSettings::UnlockTexturePackReturned(void *pParam,int iPad,C4J
 			ULONGLONG ullIndexA[1];
 			DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(pScene->m_pDLCPack->getPurchaseOfferId());
 
-			if(pDLCInfo!=NULL)
+			if(pDLCInfo!=nullptr)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Full;
 			}
@@ -1168,7 +1168,7 @@ int CScene_LoadGameSettings::UnlockTexturePackReturned(void *pParam,int iPad,C4J
 				ullIndexA[0]=pScene->m_pDLCPack->getPurchaseOfferId();
 			}
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 			// the license change coming in when the offer has been installed will cause this scene to refresh	
 		}
@@ -1238,11 +1238,11 @@ void CScene_LoadGameSettings::UpdateTexturePackDescription(int index)
 	int iTexPackId=m_pTexturePacksList->GetData(index).iData;
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackById(iTexPackId);
 
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 		// this is probably a texture pack icon added from TMS
 		DWORD dwBytes=0,dwFileBytes=0;
-		PBYTE pbData=NULL,pbFileData=NULL;
+		PBYTE pbData=nullptr,pbFileData=nullptr;
 
 		CXuiCtrl4JList::LIST_ITEM_INFO ListItem;
 		// get the current index of the list, and then get the data
@@ -1272,7 +1272,7 @@ void CScene_LoadGameSettings::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackComparison->UseBrush(NULL);
+			m_texturePackComparison->UseBrush(nullptr);
 		}
 	}
 	else
@@ -1290,7 +1290,7 @@ void CScene_LoadGameSettings::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackIcon->UseBrush(NULL);
+			m_texturePackIcon->UseBrush(nullptr);
 		}
 
 		pbImageData = tp->getPackComparison(dwImageBytes);
@@ -1302,7 +1302,7 @@ void CScene_LoadGameSettings::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackComparison->UseBrush(NULL);
+			m_texturePackComparison->UseBrush(nullptr);
 		}
 	}
 }
@@ -1311,8 +1311,8 @@ void CScene_LoadGameSettings::ClearTexturePackDescription()
 {
 	m_texturePackTitle.SetText(L" ");
 	m_texturePackDescription.SetText(L" ");
-	m_texturePackComparison->UseBrush(NULL);
-	m_texturePackIcon->UseBrush(NULL);
+	m_texturePackComparison->UseBrush(nullptr);
+	m_texturePackIcon->UseBrush(nullptr);
 }
 
 void CScene_LoadGameSettings::UpdateCurrentTexturePack()
@@ -1322,7 +1322,7 @@ void CScene_LoadGameSettings::UpdateCurrentTexturePack()
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackById(iTexPackId);
 
 	// if the texture pack is null, you don't have it yet
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 		// Upsell
 
@@ -1416,7 +1416,7 @@ void CScene_LoadGameSettings::LoadLevelGen(LevelGenerationOptions *levelGen)
 			m_bIgnoreInput=false;
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
-			StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+			StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 			return;
 		}
 	}
@@ -1438,7 +1438,7 @@ void CScene_LoadGameSettings::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = 0;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->levelGen = levelGen;
 
 	if(levelGen->requiresTexturePack())
@@ -1482,7 +1482,7 @@ void CScene_LoadGameSettings::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave timer
 	app.SetAutosaveTimerTime();
@@ -1540,7 +1540,7 @@ HRESULT CScene_LoadGameSettings::OnCustomMessage_DLCMountingComplete()
 			ListInfo.fEnabled = TRUE;			
 			hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&ListInfo.hXuiBrush);
 
-			DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tp;
+			DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tp);
 			if(pDLCTexPack)
 			{
 				int id=pDLCTexPack->getDLCParentPackId();
@@ -1566,7 +1566,7 @@ HRESULT CScene_LoadGameSettings::OnCustomMessage_DLCMountingComplete()
 	m_iTexturePacksNotInstalled=0;
 
 	// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 
 	// first pass - look to see if there are any that are not in the list
 	bool bTexturePackAlreadyListed;
@@ -1599,7 +1599,7 @@ HRESULT CScene_LoadGameSettings::OnCustomMessage_DLCMountingComplete()
 		// add a TMS request for them
 		app.DebugPrintf("+++ Adding TMSPP request for texture pack data\n");
 		app.AddTMSPPFileTypeRequest(e_DLC_TexturePackData);
-		if(m_iConfigA!=NULL)
+		if(m_iConfigA!=nullptr)
 		{
 			delete m_iConfigA;
 		}
@@ -1635,7 +1635,7 @@ HRESULT CScene_LoadGameSettings::OnCustomMessage_DLCMountingComplete()
 
 int CScene_LoadGameSettings::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_LoadGameSettings *pClass = (CScene_LoadGameSettings *)pParam;
+	CScene_LoadGameSettings *pClass = static_cast<CScene_LoadGameSettings *>(pParam);
 #ifdef _XBOX
 	pClass->m_currentTexturePackIndex = pClass->m_pTexturePacksList->GetCurSel();
 	// Exit with or without saving
@@ -1655,7 +1655,7 @@ int CScene_LoadGameSettings::TexturePackDialogReturned(void *pParam,int iPad,C4J
 		if( result==C4JStorage::EMessage_ResultAccept ) // Full version
 		{
 			ullIndexA[0]=ullOfferID_Full;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 		}
 		else // trial version
@@ -1665,7 +1665,7 @@ int CScene_LoadGameSettings::TexturePackDialogReturned(void *pParam,int iPad,C4J
 			if(pDLCInfo->ullOfferID_Trial!=0LL)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+				StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 			}
 		}		
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
index 7b9c1a56..4126c559 100644
--- a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
@@ -72,7 +72,7 @@ HRESULT CScene_Main::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	WCHAR szResourceLocator[ LOCATOR_SIZE ];
 
 	// load from the .xzp file
-	const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
+	const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr);
 	swprintf(szResourceLocator, LOCATOR_SIZE ,L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/splashes.txt");
 
 	BYTE *splashesData;
@@ -119,7 +119,7 @@ HRESULT CScene_Main::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	m_bIgnorePress=false;
 
 	// 4J Stu - Clear out any loaded game rules
-	app.setLevelGenerationOptions(NULL);
+	app.setLevelGenerationOptions(nullptr);
 
 	// Fix for #45154 - Frontend: DLC: Content can only be downloaded from the frontend if you have not joined/exited multiplayer
 	XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
@@ -325,7 +325,7 @@ HRESULT CScene_Main::OnTransitionStart( XUIMessageTransition *pTransition, BOOL&
 	if(pTransition->dwTransType == XUI_TRANSITION_TO || pTransition->dwTransType == XUI_TRANSITION_BACKTO)
 	{
 		// 4J-PB - remove the "hobo humping" message legal (Sony) say we can't have - pretty sure Microsoft would say the same if they noticed it.
-		int splashIndex = eSplashRandomStart + 1 + random->nextInt( (int)m_splashes.size() - (eSplashRandomStart + 1) );
+		int splashIndex = eSplashRandomStart + 1 + random->nextInt( static_cast<int>(m_splashes.size()) - (eSplashRandomStart + 1) );
 
 		// Override splash text on certain dates
 		SYSTEMTIME LocalSysTime;
@@ -359,7 +359,7 @@ HRESULT CScene_Main::OnTransitionStart( XUIMessageTransition *pTransition, BOOL&
 		HRESULT hr=S_OK;
 		float fWidth,fHeight;
 
-		HXUIOBJ visual=NULL;
+		HXUIOBJ visual=nullptr;
 		HXUIOBJ pulser, subtitle, text;
 		hr=XuiControlGetVisual(m_Subtitle.m_hObj,&visual);
 		hr=XuiElementGetChildById(visual,L"Pulser",&pulser);
@@ -436,7 +436,7 @@ HRESULT CScene_Main::OnControlNavigate(XUIMessageControlNavigate *pControlNaviga
 	// added so we can skip greyed out items for Minecon
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 	
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -457,7 +457,7 @@ HRESULT CScene_Main::OnKeyDown(XUIMessageInput *pInputData, BOOL& bHandled)
 
 int CScene_Main::SignInReturned(void *pParam,bool bContinue)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -470,7 +470,7 @@ int CScene_Main::SignInReturned(void *pParam,bool bContinue)
 
 int CScene_Main::DeviceSelectReturned(void *pParam,bool bContinue)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 	//HRESULT hr;
 
 	if(bContinue==true)
@@ -506,7 +506,7 @@ int CScene_Main::DeviceSelectReturned(void *pParam,bool bContinue)
 
 int CScene_Main::CreateLoad_OfflineProfileReturned(void *pParam,bool bContinue, int iPad)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -555,7 +555,7 @@ int CScene_Main::CreateLoad_OfflineProfileReturned(void *pParam,bool bContinue,
 
 int CScene_Main::CreateLoad_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -662,7 +662,7 @@ int CScene_Main::CreateLoad_SignInReturned(void *pParam,bool bContinue, int iPad
 
 int CScene_Main::MustSignInReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
@@ -787,7 +787,7 @@ int CScene_Main::Achievements_SignInReturned(void *pParam,bool bContinue,int iPa
 }
 int CScene_Main::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,int iPad)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -834,7 +834,7 @@ int CScene_Main::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,int i
 
 int CScene_Main::UnlockFullGame_SignInReturned(void *pParam,bool bContinue,int iPad)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -907,7 +907,7 @@ void CScene_Main::LoadTrial(void)
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = 0;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->settings = app.GetGameHostOption( eGameHostOption_Tutorial );
 
 	vector<LevelGenerationOptions *> *generators = app.getLevelGenerators();
@@ -915,7 +915,7 @@ void CScene_Main::LoadTrial(void)
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -1228,7 +1228,7 @@ void CScene_Main::RunUnlockOrDLC(int iPad)
 
 int CScene_Main::TMSReadFileListReturned(void *pParam,int iPad,C4JStorage::PTMSPP_FILE_LIST pTmsFileList)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	// push the file details in to a unordered map if they are not already in there
 // 	for(int i=0;i<pTmsFileList->iCount;i++)
@@ -1240,7 +1240,7 @@ int CScene_Main::TMSReadFileListReturned(void *pParam,int iPad,C4JStorage::PTMSP
 
 int CScene_Main::TMSFileWriteReturned(void *pParam,int iPad,int iResult)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	// push the file details in to a unordered map if they are not already in there
 	// 	for(int i=0;i<pTmsFileList->iCount;i++)
@@ -1252,7 +1252,7 @@ int CScene_Main::TMSFileWriteReturned(void *pParam,int iPad,int iResult)
 
 int CScene_Main::TMSFileReadReturned(void *pParam,int iPad,C4JStorage::PTMSPP_FILEDATA pData)
 {
-	CScene_Main* pClass = (CScene_Main*)pParam;
+	CScene_Main* pClass = static_cast<CScene_Main *>(pParam);
 
 	// push the file details in to a unordered map if they are not already in there
 	// 	for(int i=0;i<pTmsFileList->iCount;i++)
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
index b3608b06..b73f9305 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
@@ -38,7 +38,7 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 {
 	m_bSetup = false;
 	m_texturePackDescDisplayed = false;
-	m_iConfigA=NULL;
+	m_iConfigA=nullptr;
 
 	WCHAR TempString[256];
 	MapChildControls();
@@ -52,10 +52,10 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 	XuiControlSetText(m_labelRandomSeed,app.GetString(IDS_CREATE_NEW_WORLD_RANDOM_SEED));
 	XuiControlSetText(m_pTexturePacksList->m_hObj,app.GetString(IDS_DLC_MENU_TEXTUREPACKS));
 
-	CreateWorldMenuInitData *params = (CreateWorldMenuInitData *)pInitData->pvInitData;
+	CreateWorldMenuInitData *params = static_cast<CreateWorldMenuInitData *>(pInitData->pvInitData);
 
 	m_MoreOptionsParams.bGenerateOptions=TRUE;
-	m_MoreOptionsParams.bStructures=TRUE;	
+	m_MoreOptionsParams.bStructures=TRUE;
 	m_MoreOptionsParams.bFlatWorld=FALSE;
 	m_MoreOptionsParams.bBonusChest=FALSE;
 	m_MoreOptionsParams.bPVP = TRUE;
@@ -96,7 +96,7 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 		{
 			// The profile settings say Online, but either the player is offline, or they are not allowed to play online
 			m_MoreOptionsParams.bOnlineSettingChangedBySystem=true;
-		}	
+		}
 	}
 
 	m_ButtonGameMode.SetText(app.GetString(IDS_GAMEMODE_SURVIVAL));
@@ -104,7 +104,7 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 
 	m_CurrentDifficulty=app.GetGameSettings(m_iPad,eGameSetting_Difficulty);
 	m_SliderDifficulty.SetValue(m_CurrentDifficulty);
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[m_CurrentDifficulty]));	
+	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[m_CurrentDifficulty]));
 	m_SliderDifficulty.SetText(TempString);
 
 	ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK);
@@ -135,11 +135,11 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 	m_NewWorld.SetEnable(true);
 
 	m_EditWorldName.SetTextLimit(XCONTENT_MAX_DISPLAYNAME_LENGTH);
-	
+
 	wstring wWorldName = m_EditWorldName.GetText();
 
 	// set the caret to the end of the default text
-	m_EditWorldName.SetCaretPosition((int)wWorldName.length());
+	m_EditWorldName.SetCaretPosition(static_cast<int>(wWorldName.length()));
 	// In the dashboard, there's room for about 30 W characters on two lines before they go over the top of things
 	m_EditWorldName.SetTextLimit(25);
 
@@ -148,7 +148,7 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 
 	XuiSetTimer(m_hObj,GAME_CREATE_ONLINE_TIMER_ID,GAME_CREATE_ONLINE_TIMER_TIME);
 	XuiSetTimer(m_hObj,CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID,CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME);
-	
+
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_CreateWorldMenu, 0);
 
 	// 4J-PB - Load up any texture pack data we have locally in the XZP
@@ -176,7 +176,7 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 		m_pTexturePacksList->SetSelectionChangedHandle(m_hObj);
 
 		Minecraft *pMinecraft = Minecraft::GetInstance();
-		int texturePacksCount = pMinecraft->skins->getTexturePackCount();	
+		int texturePacksCount = pMinecraft->skins->getTexturePackCount();
 		CXuiCtrl4JList::LIST_ITEM_INFO ListInfo;
 		HRESULT hr;
 		for(unsigned int i = 0; i < texturePacksCount; ++i)
@@ -189,8 +189,8 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 
 			if(dwImageBytes > 0 && pbImageData)
 			{
-				ListInfo.fEnabled = TRUE;	
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tp;
+				ListInfo.fEnabled = true;
+				DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tp);
 				if(pDLCTexPack)
 				{
 					int id=pDLCTexPack->getDLCParentPackId();
@@ -222,7 +222,7 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 
 		// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 
-		DLC_INFO *pDLCInfo=NULL;
+		DLC_INFO *pDLCInfo=nullptr;
 
 		// first pass - look to see if there are any that are not in the list
 		bool bTexturePackAlreadyListed;
@@ -297,7 +297,7 @@ HRESULT CScene_MultiGameCreate::OnDestroy()
 			app.RemoveMemoryTPDFile(app.TMSFileA[i].iConfig);
 		}
 	}
-	
+
 	app.FreeLocalTMSFiles(eTMSFileType_TexturePack);
 
 	return S_OK;
@@ -322,7 +322,7 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 			// texture pack hasn't been set yet, so check what it will be
 			TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 
-			if(pTexturePack==NULL)
+			if(pTexturePack==nullptr)
 			{
 				// They've selected a texture pack they don't have yet
 				// upsell
@@ -338,7 +338,7 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 
 				// DLC might have been corrupt
 				if(ullOfferID_Full!=0LL)
-				{			
+				{
 					TelemetryManager->RecordUpsellPresented(ProfileManager.GetPrimaryPad(), eSet_UpsellID_Texture_DLC, ullOfferID_Full & 0xFFFFFFFF);
 
 					UINT uiIDA[3];
@@ -374,7 +374,7 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 		// if the profile data has been changed, then force a profile write (we save the online/invite/friends of friends settings)
 		// It seems we're allowed to break the 5 minute rule if it's the result of a user action
 		// check the checkboxes
-		
+
 		// Only save the online setting if the user changed it - we may change it because we're offline, but don't want that saved
 		if(!m_MoreOptionsParams.bOnlineSettingChangedBySystem)
 		{
@@ -389,15 +389,15 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 		if(m_MoreOptionsParams.dwTexturePack!=0)
 		{
 			// texture pack hasn't been set yet, so check what it will be
-			TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);		
-			
-			if(pTexturePack==NULL)
+			TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
+
+			if(pTexturePack== nullptr)
 			{
 				// corrupt DLC so set it to the default textures
 				m_MoreOptionsParams.dwTexturePack=0;
 			}
 			else
-			{		
+			{
 				m_pDLCPack=pTexturePack->getDLCPack();
 				// do we have a license?
 				if(m_pDLCPack && !m_pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
@@ -419,7 +419,7 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 						DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_pDLCPack->getPurchaseOfferId());
 						ULONGLONG ullOfferID_Full;
 
-						if(pDLCInfo!=NULL)
+						if(pDLCInfo!=nullptr)
 						{
 							ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 						}
@@ -439,11 +439,11 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 						return S_OK;
 					}
 				}
-			}		
+			}
 		}
 
 		if(m_bGameModeSurvival != true || m_MoreOptionsParams.bHostPrivileges == TRUE)
-		{			
+		{
 			UINT uiIDA[2];
 			uiIDA[0]=IDS_CONFIRM_OK;
 			uiIDA[1]=IDS_CONFIRM_CANCEL;
@@ -478,14 +478,14 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 				BOOL pccFriendsAllowed = TRUE;
 				ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 				if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
-			
+
 				if(isClientSide && noUGC )
 				{
 					m_bIgnoreInput = false;
 					SetShow( TRUE );
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+					StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 				}
 				else
 				{
@@ -495,7 +495,7 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 		}
 	}
 	else if(hObjPressed==m_MoreOptions)
-	{	
+	{
 		app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_LaunchMoreOptionsMenu,&m_MoreOptionsParams);
 	}
 	else if(hObjPressed == m_ButtonGameMode)
@@ -522,16 +522,16 @@ HRESULT CScene_MultiGameCreate::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPr
 
 int CScene_MultiGameCreate::UnlockTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameCreate* pScene = (CScene_MultiGameCreate*)pParam;
+	CScene_MultiGameCreate* pScene = static_cast<CScene_MultiGameCreate *>(pParam);
 #ifdef _XBOX
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		if(ProfileManager.IsSignedIn(iPad))
-		{	
+		{
 			ULONGLONG ullIndexA[1];
 			DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(pScene->m_pDLCPack->getPurchaseOfferId());
 
-			if(pDLCInfo!=NULL)
+			if(pDLCInfo!=nullptr)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Full;
 			}
@@ -540,9 +540,9 @@ int CScene_MultiGameCreate::UnlockTexturePackReturned(void *pParam,int iPad,C4JS
 				ullIndexA[0]=pScene->m_pDLCPack->getPurchaseOfferId();
 			}
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
-			// the license change coming in when the offer has been installed will cause this scene to refresh	
+			// the license change coming in when the offer has been installed will cause this scene to refresh
 		}
 	}
 	else
@@ -558,7 +558,7 @@ int CScene_MultiGameCreate::UnlockTexturePackReturned(void *pParam,int iPad,C4JS
 
 int CScene_MultiGameCreate::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameCreate* pScene = (CScene_MultiGameCreate*)pParam;
+	CScene_MultiGameCreate* pScene = static_cast<CScene_MultiGameCreate *>(pParam);
 	pScene->m_bIgnoreInput = false;
 	pScene->SetShow( TRUE );
 	bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pScene->m_MoreOptionsParams.bOnlineGame;
@@ -588,7 +588,7 @@ int CScene_MultiGameCreate::WarningTrialTexturePackReturned(void *pParam,int iPa
 		{
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
-			StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+			StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 		}
 		else
 		{
@@ -629,12 +629,12 @@ HRESULT CScene_MultiGameCreate::OnNotifyValueChanged (HXUIOBJ hObjSource, XUINot
 		//  Enable the done button when we have all of the necessary information
 		wstring wWorldName = m_EditWorldName.GetText();
 		BOOL bHasWorldName = ( wWorldName.length()!=0);
-		m_NewWorld.SetEnable(bHasWorldName);        
+		m_NewWorld.SetEnable(bHasWorldName);
 	}
 	else if(hObjSource==m_SliderDifficulty.GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_Difficulty,pValueChangedData->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pValueChangedData->nValue]));		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pValueChangedData->nValue]));
 		m_SliderDifficulty.SetText(TempString);
 	}
 
@@ -645,7 +645,7 @@ HRESULT CScene_MultiGameCreate::OnControlNavigate(XUIMessageControlNavigate *pCo
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest==NULL)
+	if(pControlNavigateData->hObjDest==nullptr)
 	{
 		pControlNavigateData->hObjDest=pControlNavigateData->hObjSource;
 	}
@@ -656,11 +656,11 @@ HRESULT CScene_MultiGameCreate::OnControlNavigate(XUIMessageControlNavigate *pCo
 
 HRESULT CScene_MultiGameCreate::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 {
-	// 4J-PB - TODO - Don't think we can do this - if a 2nd player signs in here with an offline profile, the signed in LIVE player gets re-logged in, and bMultiplayerAllowed is false briefly 
+	// 4J-PB - TODO - Don't think we can do this - if a 2nd player signs in here with an offline profile, the signed in LIVE player gets re-logged in, and bMultiplayerAllowed is false briefly
 	switch(pTimer->nId)
 	{
 
-	
+
 	case GAME_CREATE_ONLINE_TIMER_ID:
 		{
 			bool bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
@@ -693,7 +693,7 @@ HRESULT CScene_MultiGameCreate::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled
 			}
 		}
 		break;
-	
+
 	case CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID:
 		{
 			// also check for any new texture packs info being available
@@ -706,7 +706,7 @@ HRESULT CScene_MultiGameCreate::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled
 				if(m_iConfigA[i]!=-1)
 				{
 					DWORD dwBytes=0;
-					PBYTE pbData=NULL;
+					PBYTE pbData=nullptr;
 					//app.DebugPrintf("Retrieving iConfig %d from TPD\n",m_iConfigA[i]);
 
 					app.GetTPD(m_iConfigA[i],&pbData,&dwBytes);
@@ -715,10 +715,10 @@ HRESULT CScene_MultiGameCreate::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled
 					if(dwBytes > 0 && pbData)
 					{
 						DWORD dwImageBytes=0;
-						PBYTE pbImageData=NULL;
+						PBYTE pbImageData=nullptr;
 
 						app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes );
-						ListInfo.fEnabled = TRUE;	
+						ListInfo.fEnabled = TRUE;
 						ListInfo.iData = m_iConfigA[i];
 						HRESULT hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&ListInfo.hXuiBrush);
 						app.DebugPrintf("Adding texturepack  %d from TPD\n",m_iConfigA[i]);
@@ -734,7 +734,7 @@ HRESULT CScene_MultiGameCreate::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled
 			bool bAllDone=true;
 			for(int i=0;i<m_iTexturePacksNotInstalled;i++)
 			{
-				if(m_iConfigA[i]!=-1) 
+				if(m_iConfigA[i]!=-1)
 				{
 					bAllDone = false;
 				}
@@ -754,9 +754,9 @@ HRESULT CScene_MultiGameCreate::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled
 
 int CScene_MultiGameCreate::ConfirmCreateReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameCreate* pClass = (CScene_MultiGameCreate*)pParam;
+	CScene_MultiGameCreate* pClass = static_cast<CScene_MultiGameCreate *>(pParam);
 
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 
@@ -780,14 +780,14 @@ int CScene_MultiGameCreate::ConfirmCreateReturned(void *pParam,int iPad,C4JStora
 			BOOL pccFriendsAllowed = TRUE;
 			ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 			if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
-			
+
 			if(isClientSide && noUGC )
 			{
 				pClass->m_bIgnoreInput = false;
 				pClass->SetShow( TRUE );
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
-				StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+				StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 			}
 			else
 			{
@@ -808,7 +808,7 @@ int CScene_MultiGameCreate::ConfirmCreateReturned(void *pParam,int iPad,C4JStora
 
 int CScene_MultiGameCreate::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	CScene_MultiGameCreate* pClass = (CScene_MultiGameCreate*)pParam;
+	CScene_MultiGameCreate* pClass = static_cast<CScene_MultiGameCreate *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -816,7 +816,7 @@ int CScene_MultiGameCreate::StartGame_SignInReturned(void *pParam,bool bContinue
 		if(ProfileManager.IsSignedIn(iPad))
 		{
 			DWORD dwLocalUsersMask = 0;
-			
+
 			bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 			bool noPrivileges = false;
 
@@ -835,7 +835,7 @@ int CScene_MultiGameCreate::StartGame_SignInReturned(void *pParam,bool bContinue
 			BOOL pccFriendsAllowed = TRUE;
 			ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 			if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
-			
+
 			if(isClientSide && (noPrivileges || noUGC) )
 			{
 				if( noUGC )
@@ -844,7 +844,7 @@ int CScene_MultiGameCreate::StartGame_SignInReturned(void *pParam,bool bContinue
 					pClass->SetShow( TRUE );
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+					StorageManager.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 				}
 				else
 				{
@@ -852,7 +852,7 @@ int CScene_MultiGameCreate::StartGame_SignInReturned(void *pParam,bool bContinue
 					pClass->SetShow( TRUE );
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+					StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 				}
 			}
 			else
@@ -863,7 +863,7 @@ int CScene_MultiGameCreate::StartGame_SignInReturned(void *pParam,bool bContinue
 		}
 	}
 	else
-	{		
+	{
 		pClass->m_bIgnoreInput = false;
 		pClass->SetShow( TRUE );
 	}
@@ -884,12 +884,12 @@ void CScene_MultiGameCreate::CreateGame(CScene_MultiGameCreate* pClass, DWORD dw
 
 	// create the world and launch
 	wstring wWorldName = pClass->m_EditWorldName.GetText();
-		
+
 	StorageManager.ResetSaveData();
 	// Make our next save default to the name of the level
 	StorageManager.SetSaveTitle((wchar_t *)wWorldName.c_str());
 
-	BOOL bHasSeed = (pClass->m_EditSeed.GetText() != NULL);
+	BOOL bHasSeed = (pClass->m_EditSeed.GetText() != nullptr);
 
 	wstring wSeed;
 	if(bHasSeed)
@@ -904,12 +904,12 @@ void CScene_MultiGameCreate::CreateGame(CScene_MultiGameCreate* pClass, DWORD dw
 
 	// start the game
 	bool isFlat = (pClass->m_MoreOptionsParams.bFlatWorld==TRUE);
-	__int64 seedValue = 0; //BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal);	// 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements
+	int64_t seedValue = 0; //BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal);	// 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements
 
 	if (wSeed.length() != 0)
 	{
-		__int64 value = 0;
-		unsigned int len = (unsigned int)wSeed.length();
+		int64_t value = 0;
+		const unsigned int len = static_cast<unsigned int>(wSeed.length());
 
 		//Check if the input string contains a numerical value
 		bool isNumber = true;
@@ -923,7 +923,7 @@ void CScene_MultiGameCreate::CreateGame(CScene_MultiGameCreate* pClass, DWORD dw
 
 		//If the input string is a numerical value, convert it to a number
 		if( isNumber )
-			value = _fromString<__int64>(wSeed);
+			value = _fromString<int64_t>(wSeed);
 
 		//If the value is not 0 use it, otherwise use the algorithm from the java String.hashCode() function to hash it
 		if( value != 0 )
@@ -946,9 +946,9 @@ void CScene_MultiGameCreate::CreateGame(CScene_MultiGameCreate* pClass, DWORD dw
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = seedValue;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->texturePackId = pClass->m_MoreOptionsParams.dwTexturePack;
-	
+
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	pMinecraft->skins->selectTexturePackById(pClass->m_MoreOptionsParams.dwTexturePack);
 	//pMinecraft->skins->updateUI();
@@ -956,7 +956,7 @@ void CScene_MultiGameCreate::CreateGame(CScene_MultiGameCreate* pClass, DWORD dw
 	app.SetGameHostOption(eGameHostOption_Difficulty,Minecraft::GetInstance()->options->difficulty);
 	app.SetGameHostOption(eGameHostOption_FriendsOfFriends,pClass->m_MoreOptionsParams.bAllowFriendsOfFriends);
 	app.SetGameHostOption(eGameHostOption_Gamertags,app.GetGameSettings(pClass->m_iPad,eGameSetting_GamertagsVisible)?1:0);
-	
+
 	app.SetGameHostOption(eGameHostOption_BedrockFog,app.GetGameSettings(pClass->m_iPad,eGameSetting_BedrockFog)?1:0);
 
 // 	CXuiList listObject;
@@ -979,7 +979,7 @@ void CScene_MultiGameCreate::CreateGame(CScene_MultiGameCreate* pClass, DWORD dw
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave time
 	app.SetAutosaveTimerTime();
@@ -999,7 +999,7 @@ HRESULT CScene_MultiGameCreate::OnTransitionStart( XUIMessageTransition *pTransi
 	if(pTransition->dwTransAction==XUI_TRANSITION_ACTION_DESTROY ) return S_OK;
 
 	if(pTransition->dwTransType == XUI_TRANSITION_TO || pTransition->dwTransType == XUI_TRANSITION_BACKTO)
-	{	
+	{
 		m_SliderDifficulty.SetValueDisplay(FALSE);
 	}
 
@@ -1015,7 +1015,7 @@ HRESULT CScene_MultiGameCreate::OnTransitionEnd( XUIMessageTransition *pTransiti
 	{
 	}
 	else if(pTransition->dwTransType == XUI_TRANSITION_TO || pTransition->dwTransType == XUI_TRANSITION_BACKTO)
-	{	
+	{
 		if(m_bSetup && m_texturePackDescDisplayed)
 		{
 			XUITimeline *timeline;
@@ -1054,7 +1054,7 @@ HRESULT CScene_MultiGameCreate::OnNotifySelChanged( HXUIOBJ hObjSource, XUINotif
 	if(hObjSource == m_pTexturePacksList->m_hObj)
 	{
 		UpdateTexturePackDescription(pNotifySelChangedData->iItem);
-		
+
 		// 4J-JEV: Removed expand description check, taken care of elsewhere.
 	}
 
@@ -1095,12 +1095,12 @@ void CScene_MultiGameCreate::UpdateTexturePackDescription(int index)
 	int iTexPackId=m_pTexturePacksList->GetData(index).iData;
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackById(iTexPackId);
 
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 		// this is probably a texture pack icon added from TMS
 
 		DWORD dwBytes=0,dwFileBytes=0;
-		PBYTE pbData=NULL,pbFileData=NULL;
+		PBYTE pbData=nullptr,pbFileData=nullptr;
 
 		CXuiCtrl4JList::LIST_ITEM_INFO ListItem;
 		// get the current index of the list, and then get the data
@@ -1130,7 +1130,7 @@ void CScene_MultiGameCreate::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackComparison->UseBrush(NULL);
+			m_texturePackComparison->UseBrush(nullptr);
 		}
 	}
 	else
@@ -1156,7 +1156,7 @@ void CScene_MultiGameCreate::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackComparison->UseBrush(NULL);
+			m_texturePackComparison->UseBrush(nullptr);
 		}
 	}
 }
@@ -1168,7 +1168,7 @@ void CScene_MultiGameCreate::UpdateCurrentTexturePack()
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackById(iTexPackId);
 
 	// if the texture pack is null, you don't have it yet
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 		// Upsell
 
@@ -1205,9 +1205,9 @@ void CScene_MultiGameCreate::UpdateCurrentTexturePack()
 			StorageManager.RequestMessageBox(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CScene_MultiGameCreate::TexturePackDialogReturned,this,app.GetStringTable());
 		}
 
-		// do set the texture pack id, and on the user pressing create world, check they have it	
+		// do set the texture pack id, and on the user pressing create world, check they have it
 		m_MoreOptionsParams.dwTexturePack = ListItem.iData;
-		return ;	
+		return ;
 	}
 	else
 	{
@@ -1217,11 +1217,11 @@ void CScene_MultiGameCreate::UpdateCurrentTexturePack()
 
 int CScene_MultiGameCreate::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameCreate *pClass = (CScene_MultiGameCreate *)pParam;
+	CScene_MultiGameCreate *pClass = static_cast<CScene_MultiGameCreate *>(pParam);
 	pClass->m_currentTexturePackIndex = pClass->m_pTexturePacksList->GetCurSel();
 	// Exit with or without saving
 	// Decline means install full version of the texture pack in this dialog
-	if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultAccept)
 	{
 		// we need to enable background downloading for the DLC
 		XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
@@ -1236,7 +1236,7 @@ int CScene_MultiGameCreate::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 		if( result==C4JStorage::EMessage_ResultAccept ) // Full version
 		{
 			ullIndexA[0]=ullOfferID_Full;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 		}
 		else // trial version
@@ -1246,9 +1246,9 @@ int CScene_MultiGameCreate::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 			if(pDLCInfo->ullOfferID_Trial!=0LL)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+				StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 			}
-		}		
+		}
 	}
 	pClass->m_bIgnoreInput=false;
 	return 0;
@@ -1274,12 +1274,12 @@ HRESULT CScene_MultiGameCreate::OnCustomMessage_DLCInstalled()
 }
 
 HRESULT CScene_MultiGameCreate::OnCustomMessage_DLCMountingComplete()
-{	
+{
 	// refill the texture pack list
 	m_pTexturePacksList->SetSelectionChangedHandle(m_hObj);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	int texturePacksCount = pMinecraft->skins->getTexturePackCount();	
+	int texturePacksCount = pMinecraft->skins->getTexturePackCount();
 	CXuiCtrl4JList::LIST_ITEM_INFO ListInfo;
 	HRESULT hr;
 	for(unsigned int i = 0; i < texturePacksCount; ++i)
@@ -1292,10 +1292,10 @@ HRESULT CScene_MultiGameCreate::OnCustomMessage_DLCMountingComplete()
 
 		if(dwImageBytes > 0 && pbImageData)
 		{
-			ListInfo.fEnabled = TRUE;			
+			ListInfo.fEnabled = TRUE;
 			hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&ListInfo.hXuiBrush);
 
-			DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tp;
+			DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tp);
 			if(pDLCTexPack)
 			{
 				int id=pDLCTexPack->getDLCParentPackId();
@@ -1319,7 +1319,7 @@ HRESULT CScene_MultiGameCreate::OnCustomMessage_DLCMountingComplete()
 
 	// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 	// REMOVE UNTIL WORKING
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 
 	// first pass - look to see if there are any that are not in the list
 	bool bTexturePackAlreadyListed;
@@ -1352,7 +1352,7 @@ HRESULT CScene_MultiGameCreate::OnCustomMessage_DLCMountingComplete()
 		// add a TMS request for them
 		app.DebugPrintf("+++ Adding TMSPP request for texture pack data\n");
 		app.AddTMSPPFileTypeRequest(e_DLC_TexturePackData);
-		if(m_iConfigA!=NULL)
+		if(m_iConfigA!=nullptr)
 		{
 			delete m_iConfigA;
 		}
@@ -1392,6 +1392,6 @@ void CScene_MultiGameCreate::ClearTexturePackDescription()
 {
 	m_texturePackTitle.SetText(L" ");
 	m_texturePackDescription.SetText(L" ");
-	m_texturePackComparison->UseBrush(NULL);
-	m_texturePackIcon->UseBrush(NULL);
+	m_texturePackComparison->UseBrush(nullptr);
+	m_texturePackIcon->UseBrush(nullptr);
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
index bbfa243b..c1dba282 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
@@ -31,7 +31,7 @@ HRESULT CScene_MultiGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 	XuiControlSetText(m_labelTNTOn,app.GetString(IDS_LABEL_TNT));
 	XuiControlSetText(m_labelFireOn,app.GetString(IDS_LABEL_FIRE_SPREADS));
 
-	JoinMenuInitData *initData = (JoinMenuInitData *)pInitData->pvInitData;
+	JoinMenuInitData *initData = static_cast<JoinMenuInitData *>(pInitData->pvInitData);
 	m_selectedSession = initData->selectedSession;
 	m_iPad = initData->iPad;
 	// 4J-PB - don't delete this - it's part of the joinload structure
@@ -39,7 +39,7 @@ HRESULT CScene_MultiGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 
 	for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
 	{
-		if( m_selectedSession->data.players[i] != NULL )
+		if( m_selectedSession->data.players[i] != nullptr )
 		{
 			playersList.InsertItems(i,1);
 #ifndef _CONTENT_PACKAGE
@@ -55,7 +55,7 @@ HRESULT CScene_MultiGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 		}
 		else
 		{
-			// Leave the loop when we hit the first NULL player
+			// Leave the loop when we hit the first nullptr player
 			break;
 		}
 	}
@@ -185,7 +185,7 @@ HRESULT CScene_MultiGameInfo::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHan
 		rfHandled = TRUE;
 		break;
 	case VK_PAD_Y:
-		if(m_selectedSession != NULL && playersList.TreeHasFocus() && playersList.GetItemCount() > 0)
+		if(m_selectedSession != nullptr && playersList.TreeHasFocus() && playersList.GetItemCount() > 0)
 		{
 			PlayerUID xuid = m_selectedSession->data.players[playersList.GetCurSel()];
 			if( xuid != INVALID_XUID )
@@ -237,7 +237,7 @@ HRESULT CScene_MultiGameInfo::OnNotifyKillFocus(HXUIOBJ hObjSource, XUINotifyFoc
 
 int CScene_MultiGameInfo::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	CScene_MultiGameInfo* pClass = (CScene_MultiGameInfo*)pParam;
+	CScene_MultiGameInfo* pClass = static_cast<CScene_MultiGameInfo *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -302,7 +302,7 @@ void CScene_MultiGameInfo::JoinGame(CScene_MultiGameInfo* pClass)
 		int messageText = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL;
 		if(dwSignedInUsers > 1) messageText = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
 
-		StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, messageText, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+		StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, messageText, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 	
 	}
 	else if(noPrivileges)
@@ -311,7 +311,7 @@ void CScene_MultiGameInfo::JoinGame(CScene_MultiGameInfo* pClass)
 		pClass->m_bIgnoreInput=false;
 		UINT uiIDA[1];
 		uiIDA[0]=IDS_CONFIRM_OK;
-		StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+		StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 	}
 	else
 	{
@@ -338,7 +338,7 @@ void CScene_MultiGameInfo::JoinGame(CScene_MultiGameInfo* pClass)
 			{
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
-				StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+				StorageManager.RequestMessageBox( IDS_CONNECTION_FAILED, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 				exitReasonStringId = -1;
 
 				app.NavigateToHomeMenu();
@@ -361,7 +361,7 @@ HRESULT CScene_MultiGameInfo::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 			int selectedIndex = 0;
 			for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
 			{
-				if( m_selectedSession->data.players[i] != NULL )
+				if( m_selectedSession->data.players[i] != nullptr )
 				{
 					if(m_selectedSession->data.players[i] == selectedPlayerXUID) selectedIndex = i;
 					playersList.InsertItems(i,1);
@@ -378,7 +378,7 @@ HRESULT CScene_MultiGameInfo::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 				}
 				else
 				{
-					// Leave the loop when we hit the first NULL player
+					// Leave the loop when we hit the first nullptr player
 					break;
 				}
 			}
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
index c5e2fe9a..fab4a4fd 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
@@ -36,12 +36,12 @@
 HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	m_bReady=false;
 	MapChildControls();
 
 	m_iTexturePacksNotInstalled=0;
-	m_iConfigA=NULL;
+	m_iConfigA=nullptr;
 
 	XuiControlSetText(m_LabelNoGames,app.GetString(IDS_NO_GAMES_FOUND));
 	XuiControlSetText(m_GamesList,app.GetString(IDS_JOIN_GAME));
@@ -51,7 +51,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
 	const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string
 	WCHAR szResourceLocator[ LOCATOR_SIZE ];
 
-	const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
+	const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr);
 	swprintf(szResourceLocator, LOCATOR_SIZE ,L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/Graphics/TexturePackIcon.png");
 
 	m_DefaultMinecraftIconSize = 0;
@@ -95,10 +95,10 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
 
 	VOID *pObj;
 	XuiObjectFromHandle( m_SavesList, &pObj );
-	m_pSavesList = (CXuiCtrl4JList *)pObj;
+	m_pSavesList = static_cast<CXuiCtrl4JList *>(pObj);
 
 	XuiObjectFromHandle( m_GamesList, &pObj );
-	m_pGamesList = (CXuiCtrl4JList *)pObj;
+	m_pGamesList = static_cast<CXuiCtrl4JList *>(pObj);
 
 	// block input if we're waiting for DLC to install, and wipe the saves list. The end of dlc mounting custom message will fill the list again
 	if(app.StartInstallDLCProcess(m_iPad)==true)
@@ -185,7 +185,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
 
 	// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 
 	// first pass - look to see if there are any that are not in the list
 	bool bTexturePackAlreadyListed;
@@ -326,7 +326,7 @@ HRESULT CScene_MultiGameJoinLoad::GetSaveInfo(  )
 		if( savesDir.exists() )
 		{
 			m_saves = savesDir.listFiles();
-			uiSaveC = (unsigned int)m_saves->size();
+			uiSaveC = static_cast<unsigned int>(m_saves->size());
 		}
 		// add the New Game and Tutorial after the saves list is retrieved, if there are any saves
 
@@ -384,7 +384,7 @@ HRESULT CScene_MultiGameJoinLoad::GetSaveInfo(  )
 
 HRESULT CScene_MultiGameJoinLoad::OnDestroy()
 {
-	g_NetworkManager.SetSessionsUpdatedCallback( NULL, NULL );
+	g_NetworkManager.SetSessionsUpdatedCallback( nullptr, nullptr );
 
     for (auto& it : currentSessions )
     {
@@ -415,7 +415,7 @@ HRESULT CScene_MultiGameJoinLoad::OnDestroy()
 
 int CScene_MultiGameJoinLoad::DeviceRemovedDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline)
@@ -543,7 +543,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
 
 			CreateWorldMenuInitData *params = new CreateWorldMenuInitData();
 			params->iPad = m_iPad;
-			app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_CreateWorldMenu,(void *)params);
+			app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_CreateWorldMenu,static_cast<void *>(params));
 		}
 		else if(info.iData >= 0)
 		{
@@ -594,7 +594,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
 					// need to get the iIndex from the list item, since the position in the list doesn't correspond to the GetSaveGameInfo list because of sorting
 					params->iSaveGameInfoIndex=m_pSavesList->GetData(iIndex).iIndex-m_iDefaultButtonsC;
 					//params->pbSaveRenamed=&m_bSaveRenamed;
-					params->levelGen = NULL;
+					params->levelGen = nullptr;
 
 					// kill the texture pack timer
 					XuiKillTimer(m_hObj,CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID);
@@ -1050,7 +1050,7 @@ bool CScene_MultiGameJoinLoad::DoesSavesListHaveFocus()
 {
 	HXUIOBJ hParentObj,hObj=TreeGetFocus();
 
-	if(hObj!=NULL)
+	if(hObj!=nullptr)
 	{
 		// get the parent and see if it's the saves list
 		XuiElementGetParent(hObj,&hParentObj);
@@ -1070,7 +1070,7 @@ bool CScene_MultiGameJoinLoad::DoesMashUpWorldHaveFocus()
 {
 	HXUIOBJ hParentObj,hObj=TreeGetFocus();
 
-	if(hObj!=NULL)
+	if(hObj!=nullptr)
 	{
 		// get the parent and see if it's the saves list
 		XuiElementGetParent(hObj,&hParentObj);
@@ -1097,7 +1097,7 @@ bool CScene_MultiGameJoinLoad::DoesGamesListHaveFocus()
 {
 	HXUIOBJ hParentObj,hObj=TreeGetFocus();
 
-	if(hObj!=NULL)
+	if(hObj!=nullptr)
 	{
 		// get the parent and see if it's the saves list
 		XuiElementGetParent(hObj,&hParentObj);
@@ -1111,9 +1111,9 @@ bool CScene_MultiGameJoinLoad::DoesGamesListHaveFocus()
 
 void CScene_MultiGameJoinLoad::UpdateGamesListCallback(LPVOID lpParam)
 {
-	if(lpParam != NULL)
+	if(lpParam != nullptr)
 	{
-		CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad *) lpParam;
+		CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(lpParam);
 		// check this there's no save transfer in progress
 		if(!pClass->m_bSaveTransferInProgress)
 		{
@@ -1133,7 +1133,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
 	}
 
 	DWORD nIndex = -1;
-	FriendSessionInfo *pSelectedSession = NULL;
+	FriendSessionInfo *pSelectedSession = nullptr;
 	if(m_pGamesList->TreeHasFocus() && m_pGamesList->GetItemCount() > 0)
 	{
 		nIndex = m_pGamesList->GetCurSel();
@@ -1141,8 +1141,8 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
 	}
 
 	SessionID selectedSessionId;
-	if( pSelectedSession != NULL )selectedSessionId = pSelectedSession->sessionId;
-	pSelectedSession = NULL;
+	if( pSelectedSession != nullptr )selectedSessionId = pSelectedSession->sessionId;
+	pSelectedSession = nullptr;
 
     for (auto& it : currentSessions )
     {
@@ -1213,7 +1213,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
 
 	// Update the xui list displayed
 	unsigned int xuiListSize = m_pGamesList->GetItemCount();
-	unsigned int filteredListSize = (unsigned int)currentSessions.size();
+	unsigned int filteredListSize = static_cast<unsigned int>(currentSessions.size());
 
 	BOOL gamesListHasFocus = m_pGamesList->TreeHasFocus();
 
@@ -1269,12 +1269,12 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
 				HRESULT hr;
 
 				DWORD dwImageBytes=0;
-				PBYTE pbImageData=NULL;
+				PBYTE pbImageData=nullptr;
 
-				if(tp==NULL)
+				if(tp==nullptr)
 				{
 					DWORD dwBytes=0;
-					PBYTE pbData=NULL;
+					PBYTE pbData=nullptr;
 					app.GetTPD(sessionInfo->data.texturePackParentId,&pbData,&dwBytes);
 
 					// is it in the tpd data ?
@@ -1386,7 +1386,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
 		if(pSearchResult->dwOpenPublicSlots < m_localPlayers)
 			continue;
 
-		FriendSessionInfo *sessionInfo = NULL;
+		FriendSessionInfo *sessionInfo = nullptr;
 		bool foundSession = false;
 		for( auto it = friendsSessions.begin(); it != friendsSessions.end(); ++it)
 		{
@@ -1481,8 +1481,8 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
 	XUIRect xuiRect;
 	HXUIOBJ item = XuiListGetItemControl(m_GamesList,0);
 
-	HXUIOBJ hObj=NULL;
-	HXUIOBJ hTextPres=NULL;
+	HXUIOBJ hObj=nullptr;
+	HXUIOBJ hTextPres=nullptr;
  	HRESULT hr=XuiControlGetVisual(item,&hObj);
 	hr=XuiElementGetChildById(hObj,L"text_Label",&hTextPres);
 
@@ -1491,7 +1491,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
 	{
 		FriendSessionInfo *sessionInfo = currentSessions.at(i);
 
-		if(hTextPres != NULL )
+		if(hTextPres != nullptr )
 		{
 			hr=XuiTextPresenterMeasureText(hTextPres, sessionInfo->displayLabel, &xuiRect);
 
@@ -1528,7 +1528,7 @@ void CScene_MultiGameJoinLoad::SearchForGameCallback(void *param, DWORD dwNumRes
 
 int CScene_MultiGameJoinLoad::DeviceSelectReturned(void *pParam,bool bContinue)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 	//HRESULT hr;
 
 	if(bContinue==true)
@@ -1741,7 +1741,7 @@ HRESULT CScene_MultiGameJoinLoad::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandl
 					if(m_iConfigA[i]!=-1)
 					{
 						DWORD dwBytes=0;
-						PBYTE pbData=NULL;
+						PBYTE pbData=nullptr;
 						//app.DebugPrintf("Retrieving iConfig %d from TPD\n",m_iConfigA[i]);
 
 						app.GetTPD(m_iConfigA[i],&pbData,&dwBytes);
@@ -1814,7 +1814,7 @@ int CScene_MultiGameJoinLoad::LoadSaveDataReturned(void *pParam,bool bContinue)
 
 int CScene_MultiGameJoinLoad::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -1852,7 +1852,7 @@ void CScene_MultiGameJoinLoad::StartGameFromSave(CScene_MultiGameJoinLoad* pClas
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = NULL;
+	loadingParams->lpParam = nullptr;
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -1866,7 +1866,7 @@ void CScene_MultiGameJoinLoad::StartGameFromSave(CScene_MultiGameJoinLoad* pClas
 
 int CScene_MultiGameJoinLoad::DeleteSaveDataReturned(void *pParam,bool bSuccess)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	if(bSuccess==true)
 	{
@@ -1909,7 +1909,7 @@ void CScene_MultiGameJoinLoad::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = 0;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->settings = app.GetGameHostOption( eGameHostOption_Tutorial );
 	param->levelGen = levelGen;
 
@@ -1924,7 +1924,7 @@ void CScene_MultiGameJoinLoad::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -1945,7 +1945,7 @@ void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile)
 	// Make our next save default to the name of the level
 	StorageManager.SetSaveTitle(saveFile->getName().c_str());
 
-	__int64 fileSize = saveFile->length();
+	int64_t fileSize = saveFile->length();
 	FileInputStream fis(*saveFile);
 	byteArray ba(fileSize);
 	fis.read(ba);
@@ -1974,7 +1974,7 @@ void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile)
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -1988,7 +1988,7 @@ void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile)
 
 int CScene_MultiGameJoinLoad::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline)
 	{
@@ -2013,7 +2013,7 @@ int CScene_MultiGameJoinLoad::DeleteSaveDialogReturned(void *pParam,int iPad,C4J
 
 int CScene_MultiGameJoinLoad::SaveTransferDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -2039,7 +2039,7 @@ int CScene_MultiGameJoinLoad::SaveTransferDialogReturned(void *pParam,int iPad,C
 
 int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter )
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad *) lpParameter;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(lpParameter);
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	pMinecraft->progressRenderer->progressStart(IDS_SAVE_TRANSFER_TITLE);
@@ -2083,7 +2083,7 @@ int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
 
 		{
 			// set the save icon
-			PBYTE pbImageData=NULL;
+			PBYTE pbImageData=nullptr;
 			DWORD dwImageBytes=0;
 			XCONTENT_DATA XContentData;
 			int iIndex=pClass->m_pSavesList->GetData(pClass->m_pSavesList->GetCurSel()).iIndex-pClass->m_iDefaultButtonsC;
@@ -2092,14 +2092,14 @@ int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
 
 			// if there is no thumbnail, retrieve the default one from the file.
 			// Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save
-			if(pbImageData==NULL)
+			if(pbImageData==nullptr)
 			{
-				DWORD dwResult=XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,NULL,&dwImageBytes,NULL);
+				DWORD dwResult=XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,nullptr,&dwImageBytes,nullptr);
 				if(dwResult==ERROR_SUCCESS)
 				{
 					pClass->m_pbSaveTransferData = new BYTE[dwImageBytes];
 					pbImageData = pClass->m_pbSaveTransferData; // Copy pointer so that we can use the same name as the library owned one, but m_pbSaveTransferData will get deleted when done
-					XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,pbImageData,&dwImageBytes,NULL);
+					XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,pbImageData,&dwImageBytes,nullptr);
 				}
 			}
 
@@ -2159,7 +2159,7 @@ void CScene_MultiGameJoinLoad::DeleteFile(CScene_MultiGameJoinLoad *pClass, char
 		C4JStorage::TMS_FILETYPE_BINARY,
 		&CScene_MultiGameJoinLoad::DeleteComplete,
 		pClass,
-		NULL);
+		nullptr);
 
 	if(result != C4JStorage::ETMSStatus_DeleteInProgress)
 	{
@@ -2178,7 +2178,7 @@ void CScene_MultiGameJoinLoad::UploadFile(CScene_MultiGameJoinLoad *pClass, char
 			C4JStorage::TMS_FILETYPE_BINARY,
 			C4JStorage::TMS_UGCTYPE_NONE,
 			filename,
-			(CHAR *)data,
+			static_cast<CHAR *>(data),
 			size,
 			&CScene_MultiGameJoinLoad::TransferComplete,pClass, 0,
 			&CScene_MultiGameJoinLoad::Progress,pClass);
@@ -2189,10 +2189,10 @@ void CScene_MultiGameJoinLoad::UploadFile(CScene_MultiGameJoinLoad *pClass, char
 		File targetFileDir(L"GAME:\\FakeTMSPP");
 		if(!targetFileDir.exists()) targetFileDir.mkdir();
 		string path = string( wstringtofilename( targetFileDir.getPath() ) ).append("\\").append(filename);
-		HANDLE hSaveFile = CreateFile( path.c_str(), GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
+		HANDLE hSaveFile = CreateFile( path.c_str(), GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, nullptr);
 
 		DWORD numberOfBytesWritten = 0;
-		WriteFile( hSaveFile,data,size,&numberOfBytesWritten,NULL);
+		WriteFile( hSaveFile,data,size,&numberOfBytesWritten,nullptr);
 		assert(numberOfBytesWritten == size);
 
 		CloseHandle(hSaveFile);
@@ -2219,7 +2219,7 @@ bool CScene_MultiGameJoinLoad::WaitForTransferComplete( CScene_MultiGameJoinLoad
 		}
 		Sleep(50);
 		// update the progress
-		pMinecraft->progressRenderer->progressStagePercentage((unsigned int)(pClass->m_fProgress*100.0f));
+		pMinecraft->progressRenderer->progressStagePercentage(static_cast<unsigned int>(pClass->m_fProgress * 100.0f));
 	}
 
 	// was there a transfer error?
@@ -2229,7 +2229,7 @@ bool CScene_MultiGameJoinLoad::WaitForTransferComplete( CScene_MultiGameJoinLoad
 
 int CScene_MultiGameJoinLoad::SaveOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	// results switched for this dialog
 	// EMessage_ResultAccept means cancel
@@ -2261,7 +2261,7 @@ int CScene_MultiGameJoinLoad::SaveOptionsDialogReturned(void *pParam,int iPad,C4
 
 int CScene_MultiGameJoinLoad::LoadSaveDataReturned(void *pParam,bool bContinue)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -2310,7 +2310,7 @@ int CScene_MultiGameJoinLoad::LoadSaveDataReturned(void *pParam,bool bContinue)
 
 int CScene_MultiGameJoinLoad::Progress(void *pParam,float fProgress)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	app.DebugPrintf("Progress - %f\n",fProgress);
 	pClass->m_fProgress=fProgress;
@@ -2319,17 +2319,17 @@ int CScene_MultiGameJoinLoad::Progress(void *pParam,float fProgress)
 
 int CScene_MultiGameJoinLoad::TransferComplete(void *pParam,int iPad, int iResult)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	delete [] pClass->m_pbSaveTransferData;
-	pClass->m_pbSaveTransferData = NULL;
+	pClass->m_pbSaveTransferData = nullptr;
 	if(iResult!=0)
 	{
 		// There was a transfer fail
 		// Display a dialog
 		UINT uiIDA[1];
 		uiIDA[0]=IDS_CONFIRM_OK;
-		StorageManager.RequestMessageBox(IDS_SAVE_TRANSFER_TITLE, IDS_SAVE_TRANSFER_UPLOADFAILED, uiIDA, 1, ProfileManager.GetPrimaryPad(),NULL,NULL,app.GetStringTable());
+		StorageManager.RequestMessageBox(IDS_SAVE_TRANSFER_TITLE, IDS_SAVE_TRANSFER_UPLOADFAILED, uiIDA, 1, ProfileManager.GetPrimaryPad(),nullptr,nullptr,app.GetStringTable());
 		pClass->m_bTransferFail=true;
 	}
 	else
@@ -2343,14 +2343,14 @@ int CScene_MultiGameJoinLoad::TransferComplete(void *pParam,int iPad, int iResul
 
 int CScene_MultiGameJoinLoad::DeleteComplete(void *pParam,int iPad, int iResult)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 	pClass->m_bTransferComplete=true;
 	return 0;
 }
 
 int CScene_MultiGameJoinLoad::KeyboardReturned(void *pParam,bool bSet)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 	HRESULT hr = S_OK;
 
 	// if the user has left the name empty, treat this as backing out
@@ -2386,12 +2386,12 @@ int CScene_MultiGameJoinLoad::KeyboardReturned(void *pParam,bool bSet)
 
 int CScene_MultiGameJoinLoad::LoadSaveDataForRenameReturned(void *pParam,bool bContinue)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 #ifdef _XBOX
 	if(bContinue==true)
 	{
 		// set the save icon
-		PBYTE pbImageData=NULL;
+		PBYTE pbImageData=nullptr;
 		DWORD dwImageBytes=0;
 		HXUIBRUSH hXuiBrush;
 		XCONTENT_DATA XContentData;
@@ -2400,13 +2400,13 @@ int CScene_MultiGameJoinLoad::LoadSaveDataForRenameReturned(void *pParam,bool bC
 
 		// if there is no thumbnail, retrieve the default one from the file.
 		// Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save
-		if(pbImageData==NULL)
+		if(pbImageData==nullptr)
 		{
-			DWORD dwResult=XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,NULL,&dwImageBytes,NULL);
+			DWORD dwResult=XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,nullptr,&dwImageBytes,nullptr);
 			if(dwResult==ERROR_SUCCESS)
 			{
 				pbImageData = new BYTE[dwImageBytes];
-				XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,pbImageData,&dwImageBytes,NULL);
+				XContentGetThumbnail(ProfileManager.GetPrimaryPad(),&XContentData,pbImageData,&dwImageBytes,nullptr);
 				XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&hXuiBrush);
 			}
 		}
@@ -2428,7 +2428,7 @@ int CScene_MultiGameJoinLoad::LoadSaveDataForRenameReturned(void *pParam,bool bC
 
 int CScene_MultiGameJoinLoad::CopySaveReturned(void *pParam,bool bResult)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 #ifdef _XBOX
 	if(bResult)
 	{
@@ -2450,7 +2450,7 @@ int CScene_MultiGameJoinLoad::CopySaveReturned(void *pParam,bool bResult)
 
 int CScene_MultiGameJoinLoad::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_MultiGameJoinLoad *pClass = (CScene_MultiGameJoinLoad *)pParam;
+	CScene_MultiGameJoinLoad *pClass = static_cast<CScene_MultiGameJoinLoad *>(pParam);
 
 	// Exit with or without saving
 	// Decline means install full version of the texture pack in this dialog
@@ -2466,7 +2466,7 @@ int CScene_MultiGameJoinLoad::TexturePackDialogReturned(void *pParam,int iPad,C4
 		if( result==C4JStorage::EMessage_ResultAccept ) // Full version
 		{
 			ullIndexA[0]=ullOfferID_Full;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 		}
 		else // trial version
@@ -2476,7 +2476,7 @@ int CScene_MultiGameJoinLoad::TexturePackDialogReturned(void *pParam,int iPad,C4
 			if(pDLCInfo->ullOfferID_Trial!=0LL)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+				StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 			}
 		}
 	}
@@ -2510,7 +2510,7 @@ HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCMountingComplete()
 
 	VOID *pObj;
 	XuiObjectFromHandle( m_SavesList, &pObj );
-	m_pSavesList = (CXuiCtrl4JList *)pObj;
+	m_pSavesList = static_cast<CXuiCtrl4JList *>(pObj);
 
 	m_iChangingSaveGameInfoIndex = 0;
 
@@ -2698,7 +2698,7 @@ bool CScene_MultiGameJoinLoad::GetSavesInfoCallback(LPVOID pParam,int iTotalSave
 				// we could put in a damaged save icon here
 				const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string
 				WCHAR szResourceLocator[ LOCATOR_SIZE ];
-				const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
+				const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr);
 
 				swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/Graphics/MinecraftBrokenIcon.png");
 
@@ -2738,7 +2738,7 @@ int CScene_MultiGameJoinLoad::GetSavesInfoCallback(LPVOID lpParam,const bool)
 
 void CScene_MultiGameJoinLoad::CancelSaveUploadCallback(LPVOID lpParam)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad *) lpParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(lpParam);
 
 	StorageManager.TMSPP_CancelWriteFileWithProgress(pClass->m_iPad);
 
@@ -2750,12 +2750,12 @@ void CScene_MultiGameJoinLoad::CancelSaveUploadCallback(LPVOID lpParam)
 // 	pClass->m_eSaveUploadState = eSaveUpload_Idle;
 
 	UINT uiIDA[1] = { IDS_CONFIRM_OK };
-	ui.RequestMessageBox(IDS_XBONE_CANCEL_UPLOAD_TITLE, IDS_XBONE_CANCEL_UPLOAD_TEXT, uiIDA, 1, pClass->m_iPad, NULL, NULL, app.GetStringTable());
+	ui.RequestMessageBox(IDS_XBONE_CANCEL_UPLOAD_TITLE, IDS_XBONE_CANCEL_UPLOAD_TEXT, uiIDA, 1, pClass->m_iPad, nullptr, nullptr, app.GetStringTable());
 }
 
 void CScene_MultiGameJoinLoad::SaveUploadCompleteCallback(LPVOID lpParam)
 {
-	CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad *) lpParam;
+	CScene_MultiGameJoinLoad* pClass = static_cast<CScene_MultiGameJoinLoad *>(lpParam);
 
 	pClass->m_bSaveTransferInProgress=false;
 	// change back to the normal title group id
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
index 08656111..63d28498 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
@@ -28,7 +28,7 @@ HRESULT CScene_MultiGameLaunchMoreOptions::OnInit( XUIMessageInit* pInitData, BO
 	XuiControlSetText(m_CheckboxFlatWorld,app.GetString(IDS_SUPERFLAT_WORLD));
 	XuiControlSetText(m_CheckboxBonusChest,app.GetString(IDS_BONUS_CHEST));
 
-	m_params = (LaunchMoreOptionsMenuInitData *)pInitData->pvInitData;
+	m_params = static_cast<LaunchMoreOptionsMenuInitData *>(pInitData->pvInitData);
 
 	if(m_params->bGenerateOptions)
 	{
@@ -231,7 +231,7 @@ HRESULT CScene_MultiGameLaunchMoreOptions::OnControlNavigate(XUIMessageControlNa
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 	
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
index 49b524ff..fa6da21e 100644
--- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
@@ -8,7 +8,7 @@
 
 HRESULT CScene_NewUpdateMessage::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *) pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 	m_bIsSD=!RenderManager.IsHiDef() && !RenderManager.IsWidescreen();
 
 	MapChildControls();
diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
index 4de74d1f..0879ba27 100644
--- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
@@ -31,7 +31,7 @@
 HRESULT UIScene_PauseMenu::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	m_bIgnoreInput=true;
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 	bool bUserisClientSide = ProfileManager.IsSignedInLive(m_iPad);
 
 	app.DebugPrintf("PAUSE PRESS PROCESSING - ipad = %d, UIScene_PauseMenu::OnInit\n",m_iPad);
@@ -247,7 +247,7 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 			if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 			{
 				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+				DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 				
 				m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 
@@ -256,7 +256,7 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 					// upsell
 					ULONGLONG ullOfferID_Full;
 					// get the dlc texture pack
-					DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+					DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 					
 					app.GetDLCFullOfferIDForPackID(pDLCTexPack->getDLCParentPackId(),&ullOfferID_Full);
 
@@ -317,9 +317,9 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 				if(pNotifyPressData->UserIndex==ProfileManager.GetPrimaryPad())
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != NULL )
+					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
 					}
 					
 					if(StorageManager.GetSaveDisabled())
@@ -357,9 +357,9 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 				else
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != NULL )
+					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
 					}
 
 					TelemetryManager->RecordLevelExit(pNotifyPressData->UserIndex, eSen_LevelExitStatus_Exited);
@@ -375,9 +375,9 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 				if(pNotifyPressData->UserIndex==ProfileManager.GetPrimaryPad())
 				{		
 					int playTime = -1;
-					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != NULL )
+					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
 					}	
 					
 					// adjust the trial time played
@@ -392,9 +392,9 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 				else
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != NULL )
+					if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
 					}
 
 					TelemetryManager->RecordLevelExit(pNotifyPressData->UserIndex, eSen_LevelExitStatus_Exited);
@@ -596,7 +596,7 @@ HRESULT UIScene_PauseMenu::OnControlNavigate(XUIMessageControlNavigate *pControl
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 	
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -623,7 +623,7 @@ int UIScene_PauseMenu::DeviceSelectReturned(void *pParam,bool bContinue)
 		return 0;
 	}
 
-	UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)pParam;
+	UIScene_PauseMenu* pClass = static_cast<UIScene_PauseMenu *>(pParam);
 	bool bIsisPrimaryHost=g_NetworkManager.IsHost() && (ProfileManager.GetPrimaryPad()==pClass->m_iPad);
 	bool bDisplayBanTip = !g_NetworkManager.IsLocalGame() && !bIsisPrimaryHost && !ProfileManager.IsGuest(pClass->m_iPad);
 	bool bUserisClientSide = ProfileManager.IsSignedInLive(pClass->m_iPad);
@@ -721,7 +721,7 @@ int UIScene_PauseMenu::DeviceRemovedDialogReturned(void *pParam,int iPad,C4JStor
 		// Has someone pulled the ethernet cable and caused the pause menu to be closed before this callback returns?
 		if(app.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()))
 		{
-			UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)pParam;
+			UIScene_PauseMenu* pClass = static_cast<UIScene_PauseMenu *>(pParam);
 		
 			// use the device select returned function to wipe the saves list and change the tooltip
 			pClass->DeviceSelectReturned(pClass,true);
@@ -732,7 +732,7 @@ int UIScene_PauseMenu::DeviceRemovedDialogReturned(void *pParam,int iPad,C4JStor
 		// Change device
 		if(app.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()))
 		{
-			UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)pParam;
+			UIScene_PauseMenu* pClass = static_cast<UIScene_PauseMenu *>(pParam);
 			StorageManager.SetSaveDevice(&UIScene_PauseMenu::DeviceSelectReturned,pClass,true);
 		}
 	}
@@ -770,7 +770,7 @@ void UIScene_PauseMenu::ShowScene(bool show)
 
 int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_PauseMenu* pScene = (UIScene_PauseMenu*)pParam;
+	UIScene_PauseMenu* pScene = static_cast<UIScene_PauseMenu *>(pParam);
 
 	//pScene->m_bIgnoreInput = false;
 	pScene->ShowScene( true );
@@ -782,7 +782,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 
 			TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
 			// get the dlc texture pack
-			DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+			DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 
 			// Need to get the parent packs id, since this may be one of many child packs with their own ids
 			app.GetDLCFullOfferIDForPackID(pDLCTexPack->getDLCParentPackId(),&ullIndexA[0]);
@@ -790,7 +790,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 			// need to allow downloads here, or the player would need to quit the game to let the download of a texture pack happen. This might affect the network traffic, since the download could take all the bandwidth...
 			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 		}
 	}
 	else
@@ -804,7 +804,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 
 int UIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_PauseMenu *pClass = (UIScene_PauseMenu *)pParam;
+	UIScene_PauseMenu *pClass = static_cast<UIScene_PauseMenu *>(pParam);
 	// Exit with or without saving
 	// Decline means save in this dialog
 	if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultThirdOption) 
@@ -815,7 +815,7 @@ int UIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStora
 			if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 			{
 				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+				DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 
 				DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 				if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
@@ -890,7 +890,7 @@ int UIScene_PauseMenu::ExitGameDeclineSaveReturned(void *pParam,int iPad,C4JStor
 		// has someone disconnected the ethernet here, causing the pause menu to shut?
 		if(ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()))
 		{
-			IUIScene_PauseMenu* pClass = (IUIScene_PauseMenu*)pParam;
+			IUIScene_PauseMenu* pClass = static_cast<IUIScene_PauseMenu *>(pParam);
 			UINT uiIDA[3];
 			// you cancelled the save on exit after choosing exit and save? You go back to the Exit choices then.
 			uiIDA[0]=IDS_CONFIRM_CANCEL;
@@ -927,7 +927,7 @@ int UIScene_PauseMenu::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage:
 		// has someone disconnected the ethernet here, causing the pause menu to shut?
 		if(ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()))
 		{
-			UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)pParam;
+			UIScene_PauseMenu* pClass = static_cast<UIScene_PauseMenu *>(pParam);
 			UINT uiIDA[3];
 			// you cancelled the save on exit after choosing exit and save? You go back to the Exit choices then.
 			uiIDA[0]=IDS_CONFIRM_CANCEL;
@@ -971,7 +971,7 @@ int UIScene_PauseMenu::ExitGameDialogReturned(void *pParam,int iPad,C4JStorage::
 
 int UIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 {
-	bool bAutosave=(bool)lpParameter;
+	bool bAutosave=static_cast<bool>(lpParameter);
 	if(bAutosave)
 	{
 		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
@@ -1036,7 +1036,7 @@ void UIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	bool saveStats = true;
 	if (pMinecraft->isClientSide() || g_NetworkManager.IsInSession())
 	{
-		if(lpParameter != NULL )
+		if(lpParameter != nullptr )
 		{
 			// 4J-PB - check if we have lost connection to Live
 			if(ProfileManager.GetLiveConnectionStatus()!=XONLINE_S_LOGON_CONNECTION_ESTABLISHED )
@@ -1104,21 +1104,21 @@ void UIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 			uiIDA[0]=IDS_CONFIRM_OK;
 			// 4J Stu - Fix for #48669 - TU5: Code: Compliance: TCR #15: Incorrect/misleading messages after signing out a profile during online game session.
 			// If the primary player is signed out, then that is most likely the cause of the disconnection so don't display a message box. This will allow the message box requested by the libraries to be brought up
-			if( ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad())) ui.RequestMessageBox( exitReasonTitleId, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+			if( ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad())) ui.RequestMessageBox( exitReasonTitleId, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 			exitReasonStringId = -1;
 
 			// 4J - Force a disconnection, this handles the situation that the server has already disconnected
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect(false);
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect(false);
-			if( pMinecraft->levels[2] != NULL ) pMinecraft->levels[2]->disconnect(false);
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect(false);
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect(false);
+			if( pMinecraft->levels[2] != nullptr ) pMinecraft->levels[2]->disconnect(false);
 		}
 		else
 		{
 			exitReasonStringId = IDS_EXITING_GAME;
 			pMinecraft->progressRenderer->progressStartNoAbort( IDS_EXITING_GAME );
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect();
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect();
-			if( pMinecraft->levels[2] != NULL ) pMinecraft->levels[2]->disconnect();
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect();
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect();
+			if( pMinecraft->levels[2] != nullptr ) pMinecraft->levels[2]->disconnect();
 		}
 
 		// 4J Stu - This only does something if we actually have a server, so don't need to do any other checks
@@ -1134,7 +1134,7 @@ void UIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	}
 	else
 	{
-		if(lpParameter != NULL && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()) )
+		if(lpParameter != nullptr && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()) )
 		{
 			switch( app.GetDisconnectReason() )
 			{
@@ -1180,7 +1180,7 @@ void UIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
-			ui.RequestMessageBox( exitReasonTitleId, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+			ui.RequestMessageBox( exitReasonTitleId, exitReasonStringId, uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, app.GetStringTable());
 			exitReasonStringId = -1;
 		}
 	}
@@ -1189,7 +1189,7 @@ void UIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	{
 		Sleep(1);
 	}
-	pMinecraft->setLevel(NULL,exitReasonStringId,nullptr,saveStats);
+	pMinecraft->setLevel(nullptr,exitReasonStringId,nullptr,saveStats);
 
 	TelemetryManager->Flush();
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
index c1e06c0d..c0650335 100644
--- a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
@@ -26,7 +26,7 @@
 HRESULT CScene_Reinstall::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	// We'll only be in this menu from the main menu, not in game
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	m_bIgnoreInput=false;
 	MapChildControls();
@@ -224,7 +224,7 @@ HRESULT CScene_Reinstall::OnControlNavigate(XUIMessageControlNavigate *pControlN
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 	
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -241,7 +241,7 @@ HRESULT CScene_Reinstall::OnTransitionStart( XUIMessageTransition *pTransition,
 
 		// 4J-PB - Going to resize buttons if the text is too big to fit on any of them (Br-pt problem with the length of Unlock Full Game)
 		XUIRect xuiRect;
-		HXUIOBJ visual=NULL;
+		HXUIOBJ visual=nullptr;
 		HXUIOBJ text;
 		float fMaxTextLen=0.0f;
 		float fTextVisualLen;
@@ -283,7 +283,7 @@ HRESULT CScene_Reinstall::OnTransitionStart( XUIMessageTransition *pTransition,
 
 int CScene_Reinstall::DeviceSelectReturned(void *pParam,bool bContinue)
 {
-	CScene_Reinstall* pClass = (CScene_Reinstall*)pParam;
+	CScene_Reinstall* pClass = static_cast<CScene_Reinstall *>(pParam);
 
 	if(!StorageManager.GetSaveDeviceSelected(pClass->m_iPad))
 	{
@@ -300,7 +300,7 @@ int CScene_Reinstall::DeviceSelectReturned(void *pParam,bool bContinue)
 
 int CScene_Reinstall::DeviceSelectReturned_AndReinstall(void *pParam,bool bContinue)
 {
-	CScene_Reinstall* pClass = (CScene_Reinstall*)pParam;
+	CScene_Reinstall* pClass = static_cast<CScene_Reinstall *>(pParam);
 
 	if(!StorageManager.GetSaveDeviceSelected(pClass->m_iPad))
 	{
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
index 03e783f4..2692c8f1 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
@@ -71,8 +71,8 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
 	m_fPointerMaxX = fPanelWidth + fPointerWidth;
 	m_fPointerMaxY = fPanelHeight + (fPointerHeight/2);
 
-// 	m_hPointerText=NULL;
-// 	m_hPointerTextBkg=NULL;
+// 	m_hPointerText=nullptr;
+// 	m_hPointerTextBkg=nullptr;
 
 	UIVec2D itemPos;
 	UIVec2D itemSize;
@@ -113,7 +113,7 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
 	// Disable the default navigation behaviour for all slot lsit items (prevent old style cursor navigation).
 	for ( int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection )
 	{
-		ESceneSection eSection = ( ESceneSection )( iSection );
+		ESceneSection eSection = static_cast<ESceneSection>(iSection);
 
 		if(!IsSectionSlotList(eSection)) continue;
 
@@ -170,7 +170,7 @@ HRESULT CXuiSceneAbstractContainer::OnTransitionStart( XUIMessageTransition *pTr
 			InitDataAssociations(m_iPad, m_menu);
 		}
 
-		HXUIOBJ hObj=NULL;
+		HXUIOBJ hObj=nullptr;
 		HRESULT hr=XuiControlGetVisual(m_pointerControl->m_hObj,&hObj);
 		hr=XuiElementGetChildById(hObj,L"text_measurer",&m_hPointerTextMeasurer);
 		hr=XuiElementGetChildById(hObj,L"text_name",&m_hPointerText);
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
index 4a8617b4..36a12757 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
@@ -28,7 +28,7 @@ HRESULT CXuiSceneAnvil::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	AnvilScreenInput* initData = (AnvilScreenInput*)pInitData->pvInitData;
+	AnvilScreenInput* initData = static_cast<AnvilScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 	m_inventory = initData->inventory;
@@ -40,9 +40,9 @@ HRESULT CXuiSceneAnvil::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 		app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);	
 	}
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Anvil_Menu, this);
 	}
@@ -67,15 +67,15 @@ HRESULT CXuiSceneAnvil::OnDestroy()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -89,8 +89,8 @@ HRESULT CXuiSceneAnvil::OnNotifyValueChanged (HXUIOBJ hObjSource, XUINotifyValue
 
 		// strip leading spaces
 		wstring b;
-		int start = (int)newValue.find_first_not_of(L" ");
-		int end = (int)newValue.find_last_not_of(L" ");
+		size_t start = newValue.find_first_not_of(L" ");
+		size_t end = newValue.find_last_not_of(L" ");
 
 		if( start == wstring::npos )
 		{
@@ -99,7 +99,7 @@ HRESULT CXuiSceneAnvil::OnNotifyValueChanged (HXUIOBJ hObjSource, XUINotifyValue
 		}
 		else
 		{
-			if( end == wstring::npos ) end = (int)newValue.size()-1;
+			if( end == wstring::npos ) end = newValue.size() - 1;
 			b = newValue.substr(start,(end-start)+1);
 			newValue=b;
 		}
@@ -158,7 +158,7 @@ CXuiControl* CXuiSceneAnvil::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneAnvil::GetSectionSlotList( ESceneSection eSection )
@@ -184,7 +184,7 @@ CXuiCtrlSlotList* CXuiSceneAnvil::GetSectionSlotList( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
index 03782c79..c9a57f21 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
@@ -22,26 +22,26 @@
 
 #define PRESS_START_TIMER 0
 
-CXuiSceneBase *CXuiSceneBase::Instance = NULL;
+CXuiSceneBase *CXuiSceneBase::Instance = nullptr;
 DWORD CXuiSceneBase::m_dwTrialTimerLimitSecs=DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME;
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
 //----------------------------------------------------------------------------------
 HRESULT CXuiSceneBase::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	ASSERT( CXuiSceneBase::Instance == NULL );
+	ASSERT( CXuiSceneBase::Instance == nullptr );
 	CXuiSceneBase::Instance = this;
 
 	m_iWrongTexturePackTickC=20*5; // default 5 seconds before bringing up the upsell for not having the texture pack
 	MapChildControls();
 
 	// Display the tooltips
-	HRESULT hr = S_OK; 
+	HRESULT hr = S_OK;
 	CXuiElement xuiElement = m_hObj;
 	HXUIOBJ hTemp;
 
 
-	m_hEmptyQuadrantLogo=NULL;
+	m_hEmptyQuadrantLogo=nullptr;
 	XuiElementGetChildById(m_hObj,L"EmptyQuadrantLogo",&m_hEmptyQuadrantLogo);
 
 	D3DXVECTOR3 lastPos;
@@ -51,8 +51,8 @@ HRESULT CXuiSceneBase::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 		{
 			m_visible[idx][ i ] = FALSE;
 			m_iCurrentTooltipTextID[idx][i]=-1;
-			hTooltipText[idx][i]=NULL;
-			hTooltipTextSmall[idx][i]=NULL;
+			hTooltipText[idx][i]=nullptr;
+			hTooltipTextSmall[idx][i]=nullptr;
 			// set all tooltips to shown FALSE by default
 			m_Buttons[idx][i].SetShow( FALSE );
 			m_ButtonsSmall[idx][i].SetShow( FALSE );
@@ -106,7 +106,7 @@ HRESULT CXuiSceneBase::OnTimer(XUIMessageTimer *pData,BOOL& rfHandled)
 		// clear the quadrants
 		m_iQuadrantsMask=0;
 
-		HXUIOBJ hObj=NULL,hQuadrant;
+		HXUIOBJ hObj=nullptr,hQuadrant;
 
 		HRESULT hr=XuiControlGetVisual(m_PressStart.m_hObj,&hObj);
 
@@ -144,8 +144,8 @@ HRESULT CXuiSceneBase::OnSkinChanged(BOOL& bHandled)
 	{
 		for( unsigned int i = 0; i < BUTTONS_TOOLTIP_MAX; ++i )
 		{
-			hTooltipText[idx][i]=NULL;
-			hTooltipTextSmall[idx][i]=NULL;
+			hTooltipText[idx][i]=nullptr;
+			hTooltipTextSmall[idx][i]=nullptr;
 		}
 	}
 
@@ -169,7 +169,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 
 	// make sure there's not a mount going on before using the textures
 	if(bCheckTexturePack && app.DLCInstallProcessCompleted() )
-	{	
+	{
 		TexturePack *tPack = pMinecraft->skins->getSelected();
 
 		if(tPack->getId()!=app.GetRequiredTexturePackID())
@@ -178,7 +178,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 
 			//Is it available?
 			TexturePack * pRequiredTPack=pMinecraft->skins->getTexturePackById(app.GetRequiredTexturePackID());
-			if(pRequiredTPack!=NULL)
+			if(pRequiredTPack!=nullptr)
 			{
 				// we can switch to the required pack
 				// reset the timer
@@ -186,7 +186,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 
 				pMinecraft->skins->selectTexturePackById(app.GetRequiredTexturePackID());
 
-				// probably had background downloads enabled, so turn them off 
+				// probably had background downloads enabled, so turn them off
 				XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);
 			}
 			else
@@ -206,7 +206,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 		}
 	}
 
-	if (EnderDragonRenderer::bossInstance == NULL)
+	if (EnderDragonRenderer::bossInstance == nullptr)
 	{
 		if(m_ticksWithNoBoss<=20)
 		{
@@ -221,9 +221,9 @@ void CXuiSceneBase::_TickAllBaseScenes()
 
 		for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 		{
-			if(pMinecraft->localplayers[i] != NULL && pMinecraft->localplayers[i]->dimension == 1 && !ui.GetMenuDisplayed(i) && app.GetGameSettings(i,eGameSetting_DisplayHUD))
+			if(pMinecraft->localplayers[i] != nullptr && pMinecraft->localplayers[i]->dimension == 1 && !ui.GetMenuDisplayed(i) && app.GetGameSettings(i,eGameSetting_DisplayHUD))
 			{
-				int iGuiScale;	
+				int iGuiScale;
 
 				if(pMinecraft->localplayers[i]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 				{
@@ -234,7 +234,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 					iGuiScale=app.GetGameSettings(i,eGameSetting_UISizeSplitscreen);
 				}
 				m_BossHealthGroup[i].SetShow(TRUE);
-				m_BossHealthText[i].SetText( app.GetString( IDS_BOSS_ENDERDRAGON_HEALTH ) );		
+				m_BossHealthText[i].SetText( app.GetString( IDS_BOSS_ENDERDRAGON_HEALTH ) );
 
 				if(pMinecraft->localplayers[i]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 				{
@@ -245,7 +245,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 						m_BossHealthProgress1[i].SetShow(TRUE);
 						m_BossHealthProgress2[i].SetShow(FALSE);
 						m_BossHealthProgress3[i].SetShow(FALSE);
-						if(m_BossHealthProgress1_small[i]!=NULL)
+						if(m_BossHealthProgress1_small[i]!=nullptr)
 						{
 							m_BossHealthProgress1_small[i].SetShow(FALSE);
 							m_BossHealthProgress2_small[i].SetShow(FALSE);
@@ -259,7 +259,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 						m_BossHealthProgress1[i].SetShow(FALSE);
 						m_BossHealthProgress2[i].SetShow(TRUE);
 						m_BossHealthProgress3[i].SetShow(FALSE);
-						if(m_BossHealthProgress1_small[i]!=NULL)
+						if(m_BossHealthProgress1_small[i]!=nullptr)
 						{
 							m_BossHealthProgress1_small[i].SetShow(FALSE);
 							m_BossHealthProgress2_small[i].SetShow(FALSE);
@@ -272,7 +272,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 						m_BossHealthProgress1[i].SetShow(FALSE);
 						m_BossHealthProgress2[i].SetShow(FALSE);
 						m_BossHealthProgress3[i].SetShow(TRUE);
-						if(m_BossHealthProgress1_small[i]!=NULL)
+						if(m_BossHealthProgress1_small[i]!=nullptr)
 						{
 							m_BossHealthProgress1_small[i].SetShow(FALSE);
 							m_BossHealthProgress2_small[i].SetShow(FALSE);
@@ -295,7 +295,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 							m_BossHealthProgress1[i].SetShow(TRUE);
 							m_BossHealthProgress2[i].SetShow(FALSE);
 							m_BossHealthProgress3[i].SetShow(FALSE);
-							if(m_BossHealthProgress1_small[i]!=NULL)
+							if(m_BossHealthProgress1_small[i]!=nullptr)
 							{
 								m_BossHealthProgress1_small[i].SetShow(FALSE);
 								m_BossHealthProgress2_small[i].SetShow(FALSE);
@@ -308,7 +308,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 							m_BossHealthProgress1[i].SetShow(FALSE);
 							m_BossHealthProgress2[i].SetShow(TRUE);
 							m_BossHealthProgress3[i].SetShow(FALSE);
-							if(m_BossHealthProgress1_small[i]!=NULL)
+							if(m_BossHealthProgress1_small[i]!=nullptr)
 							{
 								m_BossHealthProgress1_small[i].SetShow(FALSE);
 								m_BossHealthProgress2_small[i].SetShow(FALSE);
@@ -320,7 +320,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 							m_BossHealthProgress1[i].SetShow(FALSE);
 							m_BossHealthProgress2[i].SetShow(FALSE);
 							m_BossHealthProgress3[i].SetShow(TRUE);
-							if(m_BossHealthProgress1_small[i]!=NULL)
+							if(m_BossHealthProgress1_small[i]!=nullptr)
 							{
 								m_BossHealthProgress1_small[i].SetShow(FALSE);
 								m_BossHealthProgress2_small[i].SetShow(FALSE);
@@ -364,7 +364,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 							break;
 						}
 					}
-				}				
+				}
 
 				m_pBossHealthProgress[i].SetRange(0, boss->getMaxHealth() );
 				m_pBossHealthProgress[i].SetValue( boss->getSynchedHealth() );
@@ -401,7 +401,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 			if(uiOpacityTimer < (SharedConstants::TICKS_PER_SECOND * 1) )
 			{
 				float fStep=(80.0f)/10.0f;
-				float fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+				float fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 
 				XuiElementSetOpacity(m_selectedItemA[i],fVal);
 				XuiElementSetOpacity(m_selectedItemSmallA[i],fVal);
@@ -441,8 +441,8 @@ void CXuiSceneBase::_TickAllBaseScenes()
 			{
 				if(uiOpacityTimer<10)
 				{
-					float fStep=(80.0f-(float)ucAlpha)/10.0f;
-					fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+					float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+					fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 				}
 				else
 				{
@@ -451,7 +451,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 			}
 			else
 			{
-				fVal=0.01f*(float)ucAlpha;
+				fVal=0.01f*static_cast<float>(ucAlpha);
 			}
 		}
 		else
@@ -461,22 +461,22 @@ void CXuiSceneBase::_TickAllBaseScenes()
 			{
 				ucAlpha=15;
 			}
-			fVal=0.01f*(float)ucAlpha;
+			fVal=0.01f*static_cast<float>(ucAlpha);
 		}
 		XuiElementSetOpacity(app.GetCurrentHUDScene(i),fVal);
 
 		XUIMessage xuiMsg;
 		CustomMessage_TickScene( &xuiMsg );
 		XuiSendMessage( app.GetCurrentHUDScene(i), &xuiMsg );
-		
+
 		bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(i) && !(app.GetXuiAction(i)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(i,eGameSetting_DisplayHUD)!=0;
-		if(bDisplayGui && pMinecraft->localplayers[i] != NULL)
+		if(bDisplayGui && pMinecraft->localplayers[i] != nullptr)
 		{
-			XuiElementSetShow(app.GetCurrentHUDScene(i),TRUE);			
+			XuiElementSetShow(app.GetCurrentHUDScene(i),TRUE);
 		}
 		else
 		{
-			XuiElementSetShow(app.GetCurrentHUDScene(i),FALSE);	
+			XuiElementSetShow(app.GetCurrentHUDScene(i),FALSE);
 		}
 	}
 }
@@ -495,29 +495,28 @@ HRESULT CXuiSceneBase::_SetEnableTooltips( unsigned int iPad, BOOL bVal )
 HRESULT CXuiSceneBase::_SetTooltipText( unsigned int iPad, unsigned int uiTooltip, int iTextID )
 {
 	ASSERT( uiTooltip < BUTTONS_TOOLTIP_MAX );
-	
+
 	XUIRect xuiRect, xuiRectSmall;
 	HRESULT hr=S_OK;
-	LPCWSTR pString=NULL;
+	LPCWSTR pString=nullptr;
 	float fWidth,fHeight;
-	
+
 	// Want to be able to show just a button (for RB LB)
 	if(iTextID>=0)
 	{
 		pString=app.GetString(iTextID);
 	}
- 
-	if(hTooltipText[iPad][uiTooltip]==NULL)
+	if(hTooltipText[iPad][uiTooltip]==nullptr)
 	{
- 		HXUIOBJ hObj=NULL;
+ 		HXUIOBJ hObj=nullptr;
  		hr=XuiControlGetVisual(m_Buttons[iPad][uiTooltip].m_hObj,&hObj);
 		hr=XuiElementGetChildById(hObj,L"text_ButtonText",&hTooltipText[iPad][uiTooltip]);
 		hr=XuiElementGetPosition(hTooltipText[iPad][uiTooltip],&m_vPosTextInTooltip[uiTooltip]);
 	}
  
-	if(hTooltipTextSmall[iPad][uiTooltip]==NULL)
+	if(hTooltipTextSmall[iPad][uiTooltip]==nullptr)
 	{
- 		HXUIOBJ hObj=NULL;
+ 		HXUIOBJ hObj=nullptr;
  		hr=XuiControlGetVisual(m_ButtonsSmall[iPad][uiTooltip].m_hObj,&hObj);
 		hr=XuiElementGetChildById(hObj,L"text_ButtonText",&hTooltipTextSmall[iPad][uiTooltip]);
 		hr=XuiElementGetPosition(hTooltipTextSmall[iPad][uiTooltip],&m_vPosTextInTooltipSmall[uiTooltip]);
@@ -525,8 +524,8 @@ HRESULT CXuiSceneBase::_SetTooltipText( unsigned int iPad, unsigned int uiToolti
 
 	if(iTextID>=0)
 	{
-		hr=XuiTextPresenterMeasureText(hTooltipText[iPad][uiTooltip], pString, &xuiRect);	
-	
+		hr=XuiTextPresenterMeasureText(hTooltipText[iPad][uiTooltip], pString, &xuiRect);
+
 		// Change the size of the whole button to be the width of the measured text, plus the position the text element starts in the visual (which is the offset by the size of the button graphic)
 		XuiElementGetBounds(m_Buttons[iPad][uiTooltip].m_hObj,&fWidth, &fHeight);
 		XuiElementSetBounds(m_Buttons[iPad][uiTooltip].m_hObj,xuiRect.right+1+m_vPosTextInTooltip[uiTooltip].x,fHeight);
@@ -537,7 +536,7 @@ HRESULT CXuiSceneBase::_SetTooltipText( unsigned int iPad, unsigned int uiToolti
 
 
 		hr=XuiTextPresenterMeasureText(hTooltipTextSmall[iPad][uiTooltip], pString, &xuiRectSmall);
-	
+
 		// Change the size of the whole button to be the width of the measured text, plus the position the text element starts in the visual (which is the offset by the size of the button graphic)
 		XuiElementGetBounds(m_ButtonsSmall[iPad][uiTooltip].m_hObj,&fWidth, &fHeight);
 		XuiElementSetBounds(m_ButtonsSmall[iPad][uiTooltip].m_hObj,xuiRectSmall.right+1+m_vPosTextInTooltipSmall[uiTooltip].x,fHeight);
@@ -627,8 +626,8 @@ HRESULT CXuiSceneBase::_ShowTooltip( unsigned int iPad, unsigned int tooltip, bo
 					{
 						if(uiOpacityTimer<10)
 						{
-							float fStep=(80.0f-(float)ucAlpha)/10.0f;
-							fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+							float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+							fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 						}
 						else
 						{
@@ -637,7 +636,7 @@ HRESULT CXuiSceneBase::_ShowTooltip( unsigned int iPad, unsigned int tooltip, bo
 					}
 					else
 					{
-						fVal=0.01f*(float)ucAlpha;
+						fVal=0.01f*static_cast<float>(ucAlpha);
 					}
 				}
 				else
@@ -647,7 +646,7 @@ HRESULT CXuiSceneBase::_ShowTooltip( unsigned int iPad, unsigned int tooltip, bo
 					{
 						ucAlpha=15;
 					}
-					fVal=0.01f*(float)ucAlpha;
+					fVal=0.01f*static_cast<float>(ucAlpha);
 				}
 
 				m_Buttons[iPad][tooltip].SetOpacity(fVal);
@@ -678,8 +677,8 @@ HRESULT CXuiSceneBase::_ShowTooltip( unsigned int iPad, unsigned int tooltip, bo
 					{
 						if(uiOpacityTimer<10)
 						{
-							float fStep=(80.0f-(float)ucAlpha)/10.0f;
-							fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+							float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+							fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 						}
 						else
 						{
@@ -688,12 +687,12 @@ HRESULT CXuiSceneBase::_ShowTooltip( unsigned int iPad, unsigned int tooltip, bo
 					}
 					else
 					{
-						fVal=0.01f*(float)ucAlpha;
+						fVal=0.01f*static_cast<float>(ucAlpha);
 					}
 				}
 				else
 				{
-					fVal=0.01f*(float)ucAlpha;
+					fVal=0.01f*static_cast<float>(ucAlpha);
 				}
 				XuiElementSetOpacity(m_hGamerTagA[iPad],fVal);
 			}
@@ -701,7 +700,7 @@ HRESULT CXuiSceneBase::_ShowTooltip( unsigned int iPad, unsigned int tooltip, bo
 			if(iPad==ProfileManager.GetPrimaryPad())
 			{
 				unsigned char ucAlpha=app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_InterfaceOpacity);
-				XuiElementSetOpacity(m_hEmptyQuadrantLogo,0.01f*(float)ucAlpha);
+				XuiElementSetOpacity(m_hEmptyQuadrantLogo,0.01f*static_cast<float>(ucAlpha));
 			}
 		}
 	}
@@ -749,7 +748,7 @@ HRESULT CXuiSceneBase::_SetTooltipsEnabled( unsigned int iPad, bool bA, bool bB,
 	m_Buttons[iPad][BUTTON_TOOLTIP_LB].SetEnable( bLB );
 	m_Buttons[iPad][BUTTON_TOOLTIP_RB].SetEnable( bRB );
 	m_Buttons[iPad][BUTTON_TOOLTIP_LS].SetEnable( bLS );
-	
+
 	m_ButtonsSmall[iPad][BUTTON_TOOLTIP_A].SetEnable( bA );
 	m_ButtonsSmall[iPad][BUTTON_TOOLTIP_B].SetEnable( bB );
 	m_ButtonsSmall[iPad][BUTTON_TOOLTIP_X].SetEnable( bX );
@@ -858,9 +857,9 @@ HRESULT CXuiSceneBase::_ShowBackground( unsigned int iPad, BOOL bShow )
 		hr=XuiElementGetChildById(hVisual,L"NightGroup",&hNight);
 		hr=XuiElementGetChildById(hVisual,L"DayGroup",&hDay);
 
-		if(bShow && pMinecraft->level!=NULL)
+		if(bShow && pMinecraft->level!=nullptr)
 		{
-			__int64 i64TimeOfDay =0;
+			int64_t i64TimeOfDay =0;
 			// are we in the Nether? - Leave the time as 0 if we are, so we show daylight
 			if(pMinecraft->level->dimension->id==0)
 			{
@@ -911,7 +910,7 @@ HRESULT CXuiSceneBase::_ShowPressStart(unsigned int iPad)
 	m_PressStart.SetShow(TRUE);
 	// retrieve the visual for this quadrant
 
-	HXUIOBJ hObj=NULL,hQuadrant;
+	HXUIOBJ hObj=nullptr,hQuadrant;
 	HRESULT hr=XuiControlGetVisual(m_PressStart.m_hObj,&hObj);
 	hr=XuiElementGetChildById(hObj,L"text_ButtonText",&hQuadrant);
 	memset(&xuiRect, 0, sizeof(xuiRect));
@@ -945,11 +944,11 @@ HRESULT CXuiSceneBase::_ShowPressStart(unsigned int iPad)
 	int nStart, nEnd;
 // 	XuiElementFindNamedFrame(  m_hObj, L"StartFlash", &nStart );
 // 	XuiElementFindNamedFrame(  m_hObj, L"EndFlash", &nEnd );
-// 	XuiElementPlayTimeline(  m_hObj, nStart, nStart, nEnd, TRUE, TRUE ); 
+// 	XuiElementPlayTimeline(  m_hObj, nStart, nStart, nEnd, TRUE, TRUE );
 	XuiElementFindNamedFrame(  hObj, L"StartFlash", &nStart );
 	XuiElementFindNamedFrame(  hObj, L"EndFlash", &nEnd );
-	XuiElementPlayTimeline(  hObj, nStart, nStart, nEnd, TRUE, TRUE ); 
-	
+	XuiElementPlayTimeline(  hObj, nStart, nStart, nEnd, TRUE, TRUE );
+
 	return S_OK;
 }
 
@@ -960,7 +959,7 @@ HRESULT CXuiSceneBase::_HidePressStart()
 
 HRESULT CXuiSceneBase::_UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
 {
-	WCHAR wcAutosaveCountdown[100]; 
+	WCHAR wcAutosaveCountdown[100];
 	swprintf( wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN),uiSeconds);
 	m_TrialTimer.SetText(wcAutosaveCountdown);
 	return S_OK;
@@ -974,15 +973,15 @@ HRESULT CXuiSceneBase::_ShowAutosaveCountdownTimer(BOOL bVal)
 
 HRESULT CXuiSceneBase::_UpdateTrialTimer(unsigned int iPad)
 {
-	WCHAR wcTime[20]; 
+	WCHAR wcTime[20];
 
-	DWORD dwTimeTicks=(DWORD)app.getTrialTimer();
+	DWORD dwTimeTicks=static_cast<DWORD>(app.getTrialTimer());
 
 	if(dwTimeTicks>m_dwTrialTimerLimitSecs)
 	{
 		dwTimeTicks=m_dwTrialTimerLimitSecs;
 	}
-	
+
 	dwTimeTicks=m_dwTrialTimerLimitSecs-dwTimeTicks;
 
 #ifndef _CONTENT_PACKAGE
@@ -1014,7 +1013,7 @@ HRESULT CXuiSceneBase::_UpdateTrialTimer(unsigned int iPad)
 
 void CXuiSceneBase::_ReduceTrialTimerValue()
 {
-	DWORD dwTimeTicks=(int)app.getTrialTimer();
+	DWORD dwTimeTicks=static_cast<int>(app.getTrialTimer());
 
 	if(dwTimeTicks>m_dwTrialTimerLimitSecs)
 	{
@@ -1038,7 +1037,7 @@ bool CXuiSceneBase::_PressStartPlaying(unsigned int iPad)
 HRESULT CXuiSceneBase::_SetPlayerBaseScenePosition( unsigned int iPad, EBaseScenePosition position )
 {
 	// turn off the empty quadrant logo
-	if(m_hEmptyQuadrantLogo!=NULL) 
+	if(m_hEmptyQuadrantLogo!=nullptr) 
 	{
 		XuiElementSetShow(m_hEmptyQuadrantLogo,FALSE);
 	}
@@ -1086,12 +1085,12 @@ HRESULT CXuiSceneBase::_SetPlayerBaseScenePosition( unsigned int iPad, EBaseScen
 		XuiElementSetShow( m_TooltipGroupSmall[iPad].m_hObj, TRUE);
 	}
 
-	if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) 
-	{	
+	if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())
+	{
 		//640x480 ->1280x720
 		scale.x = 2.0f; scale.y = 1.5f; scale.z = 1.0f;
 		XuiElementSetScale(m_hObj, &scale);
-		
+
 		return S_OK;
 	}
 
@@ -1127,7 +1126,7 @@ HRESULT CXuiSceneBase::_SetPlayerBaseScenePosition( unsigned int iPad, EBaseScen
 		// No position adjustment
 	case e_BaseScene_Fullscreen:
 		tooltipsPos.x=SAFEZONE_HALF_WIDTH;
-		tooltipsPos.y=XUI_BASE_SCENE_HEIGHT-SAFEZONE_HALF_HEIGHT-fTooltipHeight;	
+		tooltipsPos.y=XUI_BASE_SCENE_HEIGHT-SAFEZONE_HALF_HEIGHT-fTooltipHeight;
 		crouchIconPos.x=SAFEZONE_HALF_WIDTH;
 		crouchIconPos.y=SAFEZONE_HALF_HEIGHT;
 		fBackWidth=XUI_BASE_SCENE_WIDTH;
@@ -1268,7 +1267,7 @@ HRESULT CXuiSceneBase::_SetPlayerBaseScenePosition( unsigned int iPad, EBaseScen
 
 	// 4J Stu - If we already have some scenes open, then call this to update their positions
 	// Fix for #10960 - All Lang: UI: Split-screen: Changing split screen mode (vertical/horizontal) make window layout strange
-	if(Minecraft::GetInstance() != NULL && Minecraft::GetInstance()->localplayers[iPad]!=NULL)
+	if(Minecraft::GetInstance() != nullptr && Minecraft::GetInstance()->localplayers[iPad]!=nullptr)
 	{
 		// 4J-PB - Can only do this once we know what the player's UI settings are, so we need to have the player game settings read
 		_UpdateSelectedItemPos(iPad);
@@ -1303,7 +1302,7 @@ void CXuiSceneBase::_UpdateSelectedItemPos(unsigned int iPad)
 
 
 	// Only adjust if fullscreen for now, leaving code to move others if required, but it's too far up the screen when on the bottom quadrants
-	if( (m_playerBaseScenePosition[iPad] == e_BaseScene_Fullscreen) && 
+	if( (m_playerBaseScenePosition[iPad] == e_BaseScene_Fullscreen) &&
 		(RenderManager.IsHiDef() || RenderManager.IsWidescreen()) )
 	{
 		D3DXVECTOR3 selectedItemPos;
@@ -1328,18 +1327,18 @@ void CXuiSceneBase::_UpdateSelectedItemPos(unsigned int iPad)
 
 		// The move applies to the whole scene, so we'll need to move tooltips back in some cases
 
-		selectedItemPos.y=XUI_BASE_SCENE_HEIGHT-SAFEZONE_HALF_HEIGHT-fTooltipHeight - fSelectedItemHeight;	
+		selectedItemPos.y=XUI_BASE_SCENE_HEIGHT-SAFEZONE_HALF_HEIGHT-fTooltipHeight - fSelectedItemHeight;
 		selectedItemPos.x = XUI_BASE_SCENE_WIDTH_HALF - (fSelectedItemWidth/2.0f);
 
 		// Adjust selectedItemPos based on what gui is displayed
 
 
-		// 4J-PB - selected the gui scale based on the slider settings, and on whether we're in Creative or Survival		
+		// 4J-PB - selected the gui scale based on the slider settings, and on whether we're in Creative or Survival
 		float fYOffset=0.0f;
 
 		unsigned char 	ucGuiScale=app.GetGameSettings(iPad,eGameSetting_UISize) + 2;
-		
-		if(Minecraft::GetInstance() != NULL && Minecraft::GetInstance()->localgameModes[iPad] != NULL && Minecraft::GetInstance()->localgameModes[iPad]->canHurtPlayer())
+
+		if(Minecraft::GetInstance() != nullptr && Minecraft::GetInstance()->localgameModes[iPad] != nullptr && Minecraft::GetInstance()->localgameModes[iPad]->canHurtPlayer())
 		{
 			// SURVIVAL MODE - Move up further because of hearts, shield and xp
 			switch(ucGuiScale)
@@ -1353,7 +1352,7 @@ void CXuiSceneBase::_UpdateSelectedItemPos(unsigned int iPad)
 			default: // 2
 				fYOffset = -94.0f;
 				break;
-			}  
+			}
 		}
 		else
 		{
@@ -1368,7 +1367,7 @@ void CXuiSceneBase::_UpdateSelectedItemPos(unsigned int iPad)
 			default: // 2
 				fYOffset = -58.0f;
 				break;
-			}  
+			}
 		}
 
 
@@ -1425,14 +1424,14 @@ void CXuiSceneBase::_UpdateSelectedItemPos(unsigned int iPad)
 		// 4J-PB - If it's in split screen vertical, adjust the position
 		// Adjust selectedItemPos based on what gui is displayed
 		if((m_playerBaseScenePosition[iPad]==e_BaseScene_Left) || (m_playerBaseScenePosition[iPad]==e_BaseScene_Right))
-		{	
+		{
 			float scale=0.5f;
 			selectedItemPos.y -= (scale * 88.0f);
-			if(Minecraft::GetInstance() != NULL && Minecraft::GetInstance()->localgameModes[iPad] != NULL && Minecraft::GetInstance()->localgameModes[iPad]->canHurtPlayer())
+			if(Minecraft::GetInstance() != nullptr && Minecraft::GetInstance()->localgameModes[iPad] != nullptr && Minecraft::GetInstance()->localgameModes[iPad]->canHurtPlayer())
 			{
 				selectedItemPos.y -= (scale * 80.0f);
 			}
-		
+
 			// 4J-PB - selected the gui scale based on the slider settings
 			unsigned char ucGuiScale;
 			float fYOffset=0.0f;
@@ -1455,7 +1454,7 @@ void CXuiSceneBase::_UpdateSelectedItemPos(unsigned int iPad)
 			default: // 2
 				fYOffset = 85.0f;
 				break;
-			}  
+			}
 			selectedItemPos.y+=fYOffset;
 		}
 
@@ -1471,7 +1470,7 @@ CXuiSceneBase::EBaseScenePosition CXuiSceneBase::_GetPlayerBasePosition(int iPad
 
 void CXuiSceneBase::_SetEmptyQuadrantLogo(int iPad,EBaseScenePosition ePos)
 {
-	if(m_hEmptyQuadrantLogo!=NULL)
+	if(m_hEmptyQuadrantLogo!=nullptr)
 	{
 		for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 		{
@@ -1512,7 +1511,7 @@ void CXuiSceneBase::_SetEmptyQuadrantLogo(int iPad,EBaseScenePosition ePos)
 		if(ProfileManager.GetLockedProfile()!=-1)
 		{
 			unsigned char ucAlpha=app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_InterfaceOpacity);
-			XuiElementSetOpacity(m_hEmptyQuadrantLogo,0.01f*(float)ucAlpha);
+			XuiElementSetOpacity(m_hEmptyQuadrantLogo,0.01f*static_cast<float>(ucAlpha));
 		}
 
 		XuiElementSetPosition(m_hEmptyQuadrantLogo, &pos );
@@ -1606,8 +1605,8 @@ HRESULT CXuiSceneBase::_DisplayGamertag( unsigned int iPad, BOOL bDisplay )
 	{
 		// The host decides whether these are on or off
 		if(app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplaySplitscreenGamertags)!=0)
-		{		
-			if(Minecraft::GetInstance() != NULL && Minecraft::GetInstance()->localplayers[iPad]!=NULL)
+		{
+			if(Minecraft::GetInstance() != nullptr && Minecraft::GetInstance()->localplayers[iPad]!= nullptr)
 			{
 				wstring wsGamertag = convStringToWstring( ProfileManager.GetGamertag(iPad));
 				XuiControlSetText(m_hGamerTagA[iPad],wsGamertag.c_str());
@@ -1621,7 +1620,7 @@ HRESULT CXuiSceneBase::_DisplayGamertag( unsigned int iPad, BOOL bDisplay )
 	}
 	// The host decides whether these are on or off
 	if(app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplaySplitscreenGamertags)!=0)
-	{		
+	{
 		XuiElementSetShow(m_hGamerTagA[iPad],bDisplay);
 
 		// set the opacity of the gamertag
@@ -1638,8 +1637,8 @@ HRESULT CXuiSceneBase::_DisplayGamertag( unsigned int iPad, BOOL bDisplay )
 				{
 					if(uiOpacityTimer<10)
 					{
-						float fStep=(80.0f-(float)ucAlpha)/10.0f;
-						fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+						float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+						fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 					}
 					else
 					{
@@ -1648,12 +1647,12 @@ HRESULT CXuiSceneBase::_DisplayGamertag( unsigned int iPad, BOOL bDisplay )
 				}
 				else
 				{
-					fVal=0.01f*(float)ucAlpha;
+					fVal=0.01f*static_cast<float>(ucAlpha);
 				}
 			}
 			else
 			{
-				fVal=0.01f*(float)ucAlpha;
+				fVal=0.01f*static_cast<float>(ucAlpha);
 			}
 			XuiElementSetOpacity(m_hGamerTagA[iPad],0.01f*fVal);
 		}
@@ -1712,11 +1711,11 @@ void CXuiSceneBase::_HideAllGameUIElements()
 		m_uiSelectedItemOpacityCountDown[i] = 0;
 		m_selectedItemA[i].SetShow(FALSE);
 		m_selectedItemSmallA[i].SetShow(FALSE);
-		
+
 		m_BossHealthGroup[i].SetShow(FALSE);
 		m_bossHealthVisible[i] = FALSE;
 
-		XuiElementSetShow(app.GetCurrentHUDScene(i),FALSE);	
+		XuiElementSetShow(app.GetCurrentHUDScene(i),FALSE);
 
 		_DisplayGamertag(i,FALSE);
 	}
@@ -1845,12 +1844,12 @@ void CXuiSceneBase::ReLayout( unsigned int iPad )
 			if( i>0 && lastVisible!=-1 )
 			{
 				float width, height;
-				XuiElementGetBounds(m_Buttons[iPad][lastVisible].m_hObj, &width, &height); 
+				XuiElementGetBounds(m_Buttons[iPad][lastVisible].m_hObj, &width, &height);
 
 				// 4J Stu - This is for horizontal layout, will need changed if we do vertical layout
 				lastPos.x += width + m_iTooltipSpacingGap;
 
-				XuiElementGetBounds(m_ButtonsSmall[iPad][lastVisible].m_hObj, &width, &height); 
+				XuiElementGetBounds(m_ButtonsSmall[iPad][lastVisible].m_hObj, &width, &height);
 				// 4J Stu - This is for horizontal layout, will need changed if we do vertical layout
 				lastPosSmall.x += width + m_iTooltipSpacingGapSmall;
 			}
@@ -1864,7 +1863,7 @@ void CXuiSceneBase::ReLayout( unsigned int iPad )
 
 void CXuiSceneBase::TickAllBaseScenes()
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		CXuiSceneBase::Instance->_TickAllBaseScenes();
 	}
@@ -1872,7 +1871,7 @@ void CXuiSceneBase::TickAllBaseScenes()
 
 HRESULT CXuiSceneBase::SetEnableTooltips( unsigned int iPad, BOOL bVal )
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		return CXuiSceneBase::Instance->_SetEnableTooltips(iPad, bVal );
 	}
@@ -1881,7 +1880,7 @@ HRESULT CXuiSceneBase::SetEnableTooltips( unsigned int iPad, BOOL bVal )
 
 HRESULT CXuiSceneBase::SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID )
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		return CXuiSceneBase::Instance->_SetTooltipText(iPad, tooltip, iTextID );
 	}
@@ -1890,7 +1889,7 @@ HRESULT CXuiSceneBase::SetTooltipText( unsigned int iPad, unsigned int tooltip,
 
 HRESULT CXuiSceneBase::RefreshTooltips( unsigned int iPad)
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		return CXuiSceneBase::Instance->_RefreshTooltips(iPad);
 	}
@@ -1899,7 +1898,7 @@ HRESULT CXuiSceneBase::RefreshTooltips( unsigned int iPad)
 
 HRESULT CXuiSceneBase::ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show )
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		return CXuiSceneBase::Instance->_ShowTooltip(iPad, tooltip, show );
 	}
@@ -1908,7 +1907,7 @@ HRESULT CXuiSceneBase::ShowTooltip( unsigned int iPad, unsigned int tooltip, boo
 
 HRESULT CXuiSceneBase::ShowSafeArea( BOOL bShow )
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		return CXuiSceneBase::Instance->_ShowSafeArea(bShow );
 	}
@@ -1917,7 +1916,7 @@ HRESULT CXuiSceneBase::ShowSafeArea( BOOL bShow )
 
 HRESULT CXuiSceneBase::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int iY , int iLT, int iRT, int iRB, int iLB, int iLS, bool forceUpdate /*= false*/ )
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		// Enable all the tooltips. We should disable them in the scenes as required
 		CXuiSceneBase::Instance->_SetTooltipsEnabled( iPad );
@@ -1948,15 +1947,15 @@ HRESULT CXuiSceneBase::SetTooltips( unsigned int iPad, int iA, int iB, int iX, i
 			}
 			else
 			{
-				// does the tooltip need to change?	
+				// does the tooltip need to change?
 				if(CXuiSceneBase::Instance->m_iCurrentTooltipTextID[iPad][i]!=iTooptipsA[i] || forceUpdate)
 				{
 					CXuiSceneBase::Instance->SetTooltipText(iPad, i, iTooptipsA[i] );
-				}				
+				}
 				CXuiSceneBase::Instance->_ShowTooltip(iPad, i, true );
 			}
 		}
-		
+
 	}
 	return S_OK;
 }
@@ -1978,7 +1977,7 @@ HRESULT CXuiSceneBase::AnimateKeyPress(DWORD userIndex, DWORD dwKeyCode)
 
 HRESULT CXuiSceneBase::ShowSavingMessage( unsigned int iPad, C4JStorage::ESavingMessage eVal )
 {
-	if( CXuiSceneBase::Instance != NULL )
+	if( CXuiSceneBase::Instance != nullptr )
 	{
 		return CXuiSceneBase::Instance->_ShowSavingMessage(iPad, eVal);
 	}
@@ -2067,18 +2066,18 @@ HRESULT CXuiSceneBase::SetPlayerBasePositions(EBaseScenePosition pad0, EBaseScen
 }
 
 HRESULT CXuiSceneBase::UpdatePlayerBasePositions()
-{	
+{
 	EBaseScenePosition padPositions[XUSER_MAX_COUNT];
 
 	for(unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 	{
 		padPositions[idx] = e_BaseScene_NotSet;
 	}
-	
+
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	// If the game is not started (or is being held paused for a bit) then display all scenes fullscreen
-	if( pMinecraft == NULL )
+	if( pMinecraft == nullptr )
 	{
 		for( BYTE idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
@@ -2105,7 +2104,7 @@ HRESULT CXuiSceneBase::UpdatePlayerBasePositions()
 
 		for( BYTE idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 		{
-			if(pMinecraft->localplayers[idx] != NULL)
+			if(pMinecraft->localplayers[idx] != nullptr)
 			{
 				if(pMinecraft->localplayers[idx]->m_iScreenSection==C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 				{
@@ -2134,7 +2133,7 @@ HRESULT CXuiSceneBase::UpdatePlayerBasePositions()
 					padPositions[idx] = e_BaseScene_Right;
 					break;
 				case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-					padPositions[idx] = e_BaseScene_Top_Left;				
+					padPositions[idx] = e_BaseScene_Top_Left;
 					break;
 				case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 					padPositions[idx] = e_BaseScene_Top_Right;
@@ -2168,7 +2167,7 @@ void CXuiSceneBase::UpdateSelectedItemPos(int iPad)
 	CXuiSceneBase::Instance->_UpdateSelectedItemPos(iPad);
 }
 
-HXUIOBJ CXuiSceneBase::GetPlayerBaseScene(int iPad) 
+HXUIOBJ CXuiSceneBase::GetPlayerBaseScene(int iPad)
 {
 	return CXuiSceneBase::Instance->_GetPlayerBaseScene(iPad);
 }
@@ -2186,7 +2185,7 @@ void CXuiSceneBase::SetEmptyQuadrantLogo(int iScreenSection)
 	// find the empty player
 	for( iPad = 0; iPad < XUSER_MAX_COUNT; ++iPad)
 	{
-		if(pMinecraft->localplayers[iPad] == NULL)
+		if(pMinecraft->localplayers[iPad] == nullptr)
 		{
 			switch( iScreenSection)
 			{
@@ -2238,6 +2237,6 @@ void CXuiSceneBase::CreateBaseSceneInstance()
 {
 	CXuiSceneBase *sceneBase = new CXuiSceneBase();
 	BOOL handled;
-	sceneBase->OnInit(NULL,handled);
+	sceneBase->OnInit(nullptr,handled);
 }
 #endif
\ No newline at end of file
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
index cf600966..a55e8f77 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
@@ -24,7 +24,7 @@ HRESULT CXuiSceneBrewingStand::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	BrewingScreenInput* initData = (BrewingScreenInput*)pInitData->pvInitData;
+	BrewingScreenInput* initData = static_cast<BrewingScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
@@ -36,7 +36,7 @@ HRESULT CXuiSceneBrewingStand::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 	}
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -67,16 +67,16 @@ HRESULT CXuiSceneBrewingStand::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -106,7 +106,7 @@ CXuiControl* CXuiSceneBrewingStand::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneBrewingStand::GetSectionSlotList( ESceneSection eSection )
@@ -135,7 +135,7 @@ CXuiCtrlSlotList* CXuiSceneBrewingStand::GetSectionSlotList( ESceneSection eSect
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
index 39b836d2..25f5cffc 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
@@ -29,7 +29,7 @@ HRESULT CXuiSceneContainer::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	ContainerScreenInput* initData = (ContainerScreenInput*)pInitData->pvInitData;
+	ContainerScreenInput* initData = static_cast<ContainerScreenInput *>(pInitData->pvInitData);
 	
 	XuiControlSetText(m_ChestText,app.GetString(initData->container->getName()));
 
@@ -40,7 +40,7 @@ HRESULT CXuiSceneContainer::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	m_bSplitscreen=initData->bSplitscreen;
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -75,9 +75,9 @@ HRESULT CXuiSceneContainer::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	// to get it into actual back buffer coordinates, and we need those to remain whole numbers to avoid issues with point sampling
 	if(!RenderManager.IsHiDef())
 	{
-		int iY = (int)(vPos.y);
+		int iY = static_cast<int>(vPos.y);
 		iY &= 0xfffffffe;
-		vPos.y = (float)iY;
+		vPos.y = static_cast<float>(iY);
 	}
 	this->SetPosition( &vPos );
 
@@ -95,16 +95,16 @@ HRESULT CXuiSceneContainer::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -125,7 +125,7 @@ CXuiControl* CXuiSceneContainer::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneContainer::GetSectionSlotList( ESceneSection eSection )
@@ -145,7 +145,7 @@ CXuiCtrlSlotList* CXuiSceneContainer::GetSectionSlotList( ESceneSection eSection
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
index a5dc6584..f1c51ff0 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
@@ -40,7 +40,7 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 
 	D3DXVECTOR3 vec;
 	VOID *pObj;
-	CraftingPanelScreenInput* pCraftingPanelData = (CraftingPanelScreenInput*)pInitData->pvInitData;
+	CraftingPanelScreenInput* pCraftingPanelData = static_cast<CraftingPanelScreenInput *>(pInitData->pvInitData);
 	m_iContainerType=pCraftingPanelData->iContainerType;
 	m_pPlayer=pCraftingPanelData->player;
 	m_iPad=pCraftingPanelData->iPad;
@@ -89,12 +89,12 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 		for(int i=0;i<m_iIngredients3x3SlotC;i++)
 		{
 			XuiObjectFromHandle( m_hCraftIngredientA[i], &pObj );
-			m_pCraftingIngredientA[i] = (CXuiCtrlCraftIngredientSlot *)pObj;
+			m_pCraftingIngredientA[i] = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
 		}
 		XuiObjectFromHandle( m_hCraftOutput, &pObj );
-		m_pCraftingOutput = (CXuiCtrlCraftIngredientSlot *)pObj;
-		m_pGroupA=(Recipy::_eGroupType *)&m_GroupTypeMapping9GridA;
-		m_pGroupTabA=(CXuiSceneCraftingPanel::_eGroupTab *)&m_GroupTabBkgMapping3x3A;
+		m_pCraftingOutput = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
+		m_pGroupA=static_cast<Recipy::_eGroupType *>(&m_GroupTypeMapping9GridA);
+		m_pGroupTabA=static_cast<CXuiSceneCraftingPanel::_eGroupTab *>(&m_GroupTabBkgMapping3x3A);
 
 		m_iCraftablesMaxHSlotC=m_iMaxHSlot3x3C;
 
@@ -102,7 +102,7 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 		for(int i=0;i<4;i++)
 		{
 			XuiObjectFromHandle( m_hCraftIngredientDescA[i], &pObj );
-			m_pCraftIngredientDescA[i] = (CXuiCtrlCraftIngredientSlot *)pObj;
+			m_pCraftIngredientDescA[i] = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
 		}
 	}
 	else
@@ -113,13 +113,13 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 		for(int i=0;i<m_iIngredients2x2SlotC;i++)
 		{
 			XuiObjectFromHandle( m_hCraftIngredientA[i], &pObj );
-			m_pCraftingIngredientA[i] = (CXuiCtrlCraftIngredientSlot *)pObj;
+			m_pCraftingIngredientA[i] = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
 		}
 
 		XuiObjectFromHandle( m_hCraftOutput, &pObj );
-		m_pCraftingOutput = (CXuiCtrlCraftIngredientSlot *)pObj;
-		m_pGroupA=(Recipy::_eGroupType *)&m_GroupTypeMapping4GridA;
-		m_pGroupTabA=(CXuiSceneCraftingPanel::_eGroupTab *)&m_GroupTabBkgMapping2x2A;
+		m_pCraftingOutput = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
+		m_pGroupA=static_cast<Recipy::_eGroupType *>(&m_GroupTypeMapping4GridA);
+		m_pGroupTabA=static_cast<CXuiSceneCraftingPanel::_eGroupTab *>(&m_GroupTabBkgMapping2x2A);
 
 		m_iCraftablesMaxHSlotC=m_iMaxHSlot2x2C;
 
@@ -127,7 +127,7 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 		for(int i=0;i<4;i++)
 		{
 			XuiObjectFromHandle( m_hCraftIngredientDescA[i], &pObj );
-			m_pCraftIngredientDescA[i] = (CXuiCtrlCraftIngredientSlot *)pObj;
+			m_pCraftIngredientDescA[i] = static_cast<CXuiCtrlCraftIngredientSlot *>(pObj);
 		}
 	}
 
@@ -165,7 +165,7 @@ HRESULT CXuiSceneCraftingPanel::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -206,7 +206,7 @@ HRESULT CXuiSceneCraftingPanel::OnTransitionEnd( XUIMessageTransition *pTransDat
 		{
 			for(int i=0;i<m_iMaxGroup3x3;i++)
 			{
-				m_hGroupIconA[i].PlayVisualRange(m_GroupIconNameA[m_pGroupA[i]],NULL,m_GroupIconNameA[m_pGroupA[i]]);
+				m_hGroupIconA[i].PlayVisualRange(m_GroupIconNameA[m_pGroupA[i]],nullptr,m_GroupIconNameA[m_pGroupA[i]]);
 				XuiElementSetShow(m_hGroupIconA[i].m_hObj,TRUE);
 			}
 		}
@@ -214,7 +214,7 @@ HRESULT CXuiSceneCraftingPanel::OnTransitionEnd( XUIMessageTransition *pTransDat
 		{
 			for(int i=0;i<m_iMaxGroup2x2;i++)
 			{
-				m_hGroupIconA[i].PlayVisualRange(m_GroupIconNameA[m_pGroupA[i]],NULL,m_GroupIconNameA[m_pGroupA[i]]);
+				m_hGroupIconA[i].PlayVisualRange(m_GroupIconNameA[m_pGroupA[i]],nullptr,m_GroupIconNameA[m_pGroupA[i]]);
 				XuiElementSetShow(m_hGroupIconA[i].m_hObj,TRUE);
 			}
 		}
@@ -336,7 +336,7 @@ HRESULT CXuiSceneCraftingPanel::OnGetSourceImage(XUIMessageGetSourceImage* pData
 	HRESULT hr = S_OK;
 	//int iId=pData->iItem;
 	int iId=(pData->iData>>22)&0x1FF;
-	pData->szPath = NULL;
+	pData->szPath = nullptr;
 	pData->bDirty=true;
 	rfHandled = TRUE;
 	return hr;
@@ -352,15 +352,15 @@ HRESULT CXuiSceneCraftingPanel::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 
 	return S_OK;
 }
@@ -433,7 +433,7 @@ void CXuiSceneCraftingPanel::setCraftVSlotItem(int iPad, int iIndex, shared_ptr<
 
 void CXuiSceneCraftingPanel::setCraftingOutputSlotItem(int iPad, shared_ptr<ItemInstance> item)
 {
-	if(item == NULL)
+	if(item == nullptr)
 	{
 		m_pCraftingOutput->SetIcon(iPad, 0,0,0,0,0,false);
 	}
@@ -450,7 +450,7 @@ void CXuiSceneCraftingPanel::setCraftingOutputSlotRedBox(bool show)
 
 void CXuiSceneCraftingPanel::setIngredientSlotItem(int iPad, int index, shared_ptr<ItemInstance> item)
 {
-	if(item == NULL)
+	if(item == nullptr)
 	{
 		m_pCraftingIngredientA[index]->SetIcon(iPad, 0,0,0,0,0,false);
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
index 5b3c7226..dabe6d6d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
@@ -30,7 +30,7 @@ HRESULT CXuiSceneEnchant::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	EnchantingScreenInput *initData = (EnchantingScreenInput *) pInitData->pvInitData;
+	EnchantingScreenInput *initData = static_cast<EnchantingScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
@@ -42,7 +42,7 @@ HRESULT CXuiSceneEnchant::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 	}
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -73,16 +73,16 @@ HRESULT CXuiSceneEnchant::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -112,7 +112,7 @@ CXuiControl* CXuiSceneEnchant::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneEnchant::GetSectionSlotList( ESceneSection eSection )
@@ -132,7 +132,7 @@ CXuiCtrlSlotList* CXuiSceneEnchant::GetSectionSlotList( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
index 832d6b4c..c5e2d22c 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
@@ -26,7 +26,7 @@ HRESULT CXuiSceneFurnace::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	FurnaceScreenInput* initData = (FurnaceScreenInput*)pInitData->pvInitData;
+	FurnaceScreenInput* initData = static_cast<FurnaceScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
@@ -38,7 +38,7 @@ HRESULT CXuiSceneFurnace::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	}
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -69,16 +69,16 @@ HRESULT CXuiSceneFurnace::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -105,7 +105,7 @@ CXuiControl* CXuiSceneFurnace::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneFurnace::GetSectionSlotList( ESceneSection eSection )
@@ -131,7 +131,7 @@ CXuiCtrlSlotList* CXuiSceneFurnace::GetSectionSlotList( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
index 6024b8d6..e86ff67e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
@@ -23,7 +23,7 @@ HRESULT CXuiSceneInventory::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	InventoryScreenInput *initData = (InventoryScreenInput *)pInitData->pvInitData;
+	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
@@ -38,7 +38,7 @@ HRESULT CXuiSceneInventory::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 	}
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -79,15 +79,15 @@ HRESULT CXuiSceneInventory::OnDestroy()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -118,7 +118,7 @@ CXuiControl* CXuiSceneInventory::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneInventory::GetSectionSlotList( ESceneSection eSection )
@@ -138,7 +138,7 @@ CXuiCtrlSlotList* CXuiSceneInventory::GetSectionSlotList( ESceneSection eSection
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
@@ -156,12 +156,12 @@ void CXuiSceneInventory::updateEffectsDisplay()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<LocalPlayer> player = pMinecraft->localplayers[m_iPad];
 
-	if(player == NULL) return;
+	if(player == nullptr) return;
 
 	vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
 
 	// Work out how to arrange the effects
-	int effectCount = (int)activeEffects->size();
+	int effectCount = static_cast<int>(activeEffects->size());
 
 	// Total size of all effects + spacing, minus spacing for the last effect
 	float fHeight = (effectCount * m_effectDisplaySpacing) - (m_effectDisplaySpacing - m_effectDisplayHeight);
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
index 0793fc9e..0fa3e780 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
@@ -33,7 +33,7 @@ HRESULT CXuiSceneInventoryCreative::OnInit( XUIMessageInit *pInitData, BOOL &bHa
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	InventoryScreenInput *initData = (InventoryScreenInput *)pInitData->pvInitData;
+	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
@@ -48,7 +48,7 @@ HRESULT CXuiSceneInventoryCreative::OnInit( XUIMessageInit *pInitData, BOOL &bHa
 	}
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -60,7 +60,7 @@ HRESULT CXuiSceneInventoryCreative::OnInit( XUIMessageInit *pInitData, BOOL &bHa
 	initData->player->awardStat(GenericStats::openInventory(), GenericStats::param_noArgs());
 
 	// 4J JEV - Item Picker Menu
-	shared_ptr<SimpleContainer> creativeContainer = shared_ptr<SimpleContainer>(new SimpleContainer( 0, TabSpec::MAX_SIZE + 9 ));
+	shared_ptr<SimpleContainer> creativeContainer = std::make_shared<SimpleContainer>(0, TabSpec::MAX_SIZE + 9);
 	itemPickerMenu = new ItemPickerMenu(creativeContainer, initData->player->inventory);
 	
 	// 4J JEV - InitDataAssociations.
@@ -95,16 +95,16 @@ HRESULT CXuiSceneInventoryCreative::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -126,7 +126,7 @@ HRESULT CXuiSceneInventoryCreative::OnTransitionEnd( XUIMessageTransition *pTran
 	{
 		for(int i=0;i<eCreativeInventoryTab_COUNT;i++)
 		{
-			m_hGroupIconA[i].PlayVisualRange(specs[i]->m_icon,NULL,specs[i]->m_icon);
+			m_hGroupIconA[i].PlayVisualRange(specs[i]->m_icon,nullptr,specs[i]->m_icon);
 			XuiElementSetShow(m_hGroupIconA[i].m_hObj,TRUE);
 		}
 	}
@@ -139,16 +139,16 @@ CXuiControl* CXuiSceneInventoryCreative::GetSectionControl( ESceneSection eSecti
 	switch( eSection )
 	{
 	case eSectionInventoryCreativeUsing:
-		return (CXuiControl *)m_useRowControl;
+		return static_cast<CXuiControl *>(m_useRowControl);
 		break;
 	case eSectionInventoryCreativeSelector:
-		return (CXuiControl *)m_containerControl;
+		return static_cast<CXuiControl *>(m_containerControl);
 		break;
 	default:
 		assert( false );
 		break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneInventoryCreative::GetSectionSlotList( ESceneSection eSection )
@@ -165,7 +165,7 @@ CXuiCtrlSlotList* CXuiSceneInventoryCreative::GetSectionSlotList( ESceneSection
 		assert( false );
 		break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 void CXuiSceneInventoryCreative::updateTabHighlightAndText(ECreativeInventoryTabs tab)
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
index 8738e683..3fbca979 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
@@ -27,7 +27,7 @@ HRESULT CXuiSceneTrading::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	TradingScreenInput* initData = (TradingScreenInput *)pInitData->pvInitData;
+	TradingScreenInput* initData = static_cast<TradingScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 	m_merchant = initData->trader;
@@ -39,9 +39,9 @@ HRESULT CXuiSceneTrading::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 		app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
 	}
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trading_Menu, this);
 	}
@@ -79,15 +79,15 @@ HRESULT CXuiSceneTrading::OnDestroy()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -97,7 +97,7 @@ HRESULT CXuiSceneTrading::OnTransitionStart( XUIMessageTransition *pTransition,
 
 	if(pTransition->dwTransType == XUI_TRANSITION_TO || pTransition->dwTransType == XUI_TRANSITION_BACKTO)
 	{
-		HXUIOBJ hObj=NULL;
+		HXUIOBJ hObj=nullptr;
 		HRESULT hr=XuiControlGetVisual(m_offerInfoControl.m_hObj,&hObj);
 		hr=XuiElementGetChildById(hObj,L"text_measurer",&m_hOfferInfoTextMeasurer);
 		hr=XuiElementGetChildById(hObj,L"text_name",&m_hOfferInfoText);
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
index 99dc6e4c..326e6263 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
@@ -22,12 +22,12 @@ HRESULT CXuiSceneTrap::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	TrapScreenInput* initData = (TrapScreenInput*)pInitData->pvInitData;
+	TrapScreenInput* initData = static_cast<TrapScreenInput *>(pInitData->pvInitData);
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -57,16 +57,16 @@ HRESULT CXuiSceneTrap::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -87,7 +87,7 @@ CXuiControl* CXuiSceneTrap::GetSectionControl( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 CXuiCtrlSlotList* CXuiSceneTrap::GetSectionSlotList( ESceneSection eSection )
@@ -107,7 +107,7 @@ CXuiCtrlSlotList* CXuiSceneTrap::GetSectionSlotList( ESceneSection eSection )
 			assert( false );
 			break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 // 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
index 19e6b016..c4c279a6 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
@@ -21,7 +21,7 @@ const float CScene_Win::PLAYER_SCROLL_SPEED = 3.0f;
 //----------------------------------------------------------------------------------
 HRESULT CScene_Win::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	m_bIgnoreInput = false;
 
@@ -57,18 +57,18 @@ HRESULT CScene_Win::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	noNoiseString = app.FormatHTMLString(m_iPad, noNoiseString, 0xff000000);
 
 	Random random(8124371);
-	int found=(int)noNoiseString.find_first_of(L"{");
-	int length;
+	size_t found=noNoiseString.find_first_of(L"{");
+	size_t length;
 	while (found!=string::npos)
 	{
 		length = random.nextInt(4) + 3;
 		m_noiseLengths.push_back(length);
-		found=(int)noNoiseString.find_first_of(L"{",found+1);
+		found=noNoiseString.find_first_of(L"{", found + 1);
 	}
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if(pMinecraft->localplayers[s_winUserIndex] != NULL)
+	if(pMinecraft->localplayers[s_winUserIndex] != nullptr)
 	{
 		noNoiseString = replaceAll(noNoiseString,L"{*PLAYER*}",pMinecraft->localplayers[s_winUserIndex]->name);
 	}
@@ -134,7 +134,7 @@ HRESULT CScene_Win::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 			app.CloseAllPlayersXuiScenes();
 			for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 			{
-				if(pMinecraft->localplayers[i] != NULL)
+				if(pMinecraft->localplayers[i] != nullptr)
 				{
 					app.SetAction(i,eAppAction_Respawn);
 				}
@@ -143,7 +143,7 @@ HRESULT CScene_Win::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 			// Show the other players scenes
 			CXuiSceneBase::ShowOtherPlayersBaseScene(pInputData->UserIndex, true);
 			// This just allows it to be shown
-			if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
+			if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
 			ui.UpdatePlayerBasePositions();
 
 			rfHandled = TRUE;
@@ -277,7 +277,7 @@ HRESULT CScene_Win::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 	CXuiSceneBase::ShowOtherPlayersBaseScene(ProfileManager.GetPrimaryPad(), false);
 
 	// This just allows it to be shown
-	if(Minecraft::GetInstance()->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) Minecraft::GetInstance()->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(false);
+	if(Minecraft::GetInstance()->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) Minecraft::GetInstance()->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(false);
 
 	// Temporarily make this scene fullscreen
 	CXuiSceneBase::SetPlayerBaseScenePosition( ProfileManager.GetPrimaryPad(), CXuiSceneBase::e_BaseScene_Fullscreen );
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
index c6dc7118..3c37b8d8 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
@@ -10,9 +10,9 @@
 HRESULT CScene_SettingsAll::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	//WCHAR TempString[256];
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	MapChildControls();
 	
@@ -112,7 +112,7 @@ HRESULT CScene_SettingsAll::OnControlNavigate(XUIMessageControlNavigate *pContro
 	// added so we can skip greyed out items
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -181,7 +181,7 @@ HRESULT CScene_SettingsAll::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 
 HRESULT CScene_SettingsAll::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// if we're not in the game, we need to use basescene 0 
 	if(bNotInGame)
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
index 0f0fe2e3..6f399d55 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
@@ -7,9 +7,9 @@
 HRESULT CScene_SettingsAudio::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	WCHAR TempString[256];
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	MapChildControls();
 
@@ -86,13 +86,13 @@ HRESULT CScene_SettingsAudio::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotif
 	if(hObjSource==m_SliderA[SLIDER_SETTINGS_MUSIC].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_MusicVolume,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_MUSIC ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_MUSIC ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_MUSIC].SetText(TempString);
 	}
 	else if(hObjSource==m_SliderA[SLIDER_SETTINGS_SOUND].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_SoundFXVolume,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SOUND ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SOUND ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_SOUND].SetText(TempString);
 	}
 	
@@ -141,7 +141,7 @@ HRESULT CScene_SettingsAudio::OnControlNavigate(XUIMessageControlNavigate *pCont
 	// added so we can skip greyed out items
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -240,7 +240,7 @@ HRESULT CScene_SettingsAudio::OnTransitionStart( XUIMessageTransition *pTransiti
 
 HRESULT CScene_SettingsAudio::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// if we're not in the game, we need to use basescene 0 
 	if(bNotInGame)
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
index 7e2835a2..4fa335fb 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
@@ -10,9 +10,9 @@
 HRESULT CScene_SettingsControl::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	WCHAR TempString[256];
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	MapChildControls();
 
@@ -66,13 +66,13 @@ HRESULT CScene_SettingsControl::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINot
 	if(hObjSource==m_SliderA[SLIDER_SETTINGS_SENSITIVITY_INGAME].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_Sensitivity_InGame,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SENSITIVITY_INGAME ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SENSITIVITY_INGAME ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_SENSITIVITY_INGAME].SetText(TempString);
 	}
 	else if(hObjSource==m_SliderA[SLIDER_SETTINGS_SENSITIVITY_INMENU].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_Sensitivity_InMenu,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SENSITIVITY_INMENU ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_SENSITIVITY_INMENU ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_SENSITIVITY_INMENU].SetText(TempString);
 	}
 
@@ -120,7 +120,7 @@ HRESULT CScene_SettingsControl::OnControlNavigate(XUIMessageControlNavigate *pCo
 	// added so we can skip greyed out items
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -218,7 +218,7 @@ HRESULT CScene_SettingsControl::OnTransitionStart( XUIMessageTransition *pTransi
 
 HRESULT CScene_SettingsControl::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// if we're not in the game, we need to use basescene 0 
 	if(bNotInGame)
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
index 48a933e2..d73baa0b 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
@@ -10,9 +10,9 @@
 HRESULT CScene_SettingsGraphics::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	WCHAR TempString[256];
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bIsPrimaryPad=(ProfileManager.GetPrimaryPad()==m_iPad);
 
 	MapChildControls();
@@ -139,13 +139,13 @@ HRESULT CScene_SettingsGraphics::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINo
 	if(hObjSource==m_SliderA[SLIDER_SETTINGS_GAMMA].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_Gamma,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_GAMMA].SetText(TempString);
 	}
 	else if(hObjSource==m_SliderA[SLIDER_SETTINGS_INTERFACE_OPACITY].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_InterfaceOpacity,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_INTERFACE_OPACITY].SetText(TempString);
 	}
 
@@ -198,7 +198,7 @@ HRESULT CScene_SettingsGraphics::OnControlNavigate(XUIMessageControlNavigate *pC
 	// added so we can skip greyed out items
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -310,7 +310,7 @@ HRESULT CScene_SettingsGraphics::OnTransitionStart( XUIMessageTransition *pTrans
 
 HRESULT CScene_SettingsGraphics::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// if we're not in the game, we need to use basescene 0 
 	if(bNotInGame)
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
index 526847c7..683ee175 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
@@ -26,9 +26,9 @@ int CScene_SettingsOptions::m_iDifficultyTitleSettingA[4]=
 HRESULT CScene_SettingsOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	WCHAR TempString[256];
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 
 	MapChildControls();
@@ -274,14 +274,14 @@ HRESULT CScene_SettingsOptions::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINot
 		else
 		{
 			app.SetAutosaveTimerTime();
-			swprintf( (WCHAR *)TempString, 256, L"%ls: %d %ls", app.GetString( IDS_SLIDER_AUTOSAVE ),pNotifyValueChanged->nValue*15, app.GetString( IDS_MINUTES ));		
+			swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d %ls", app.GetString( IDS_SLIDER_AUTOSAVE ),pNotifyValueChanged->nValue*15, app.GetString( IDS_MINUTES ));		
 		}
 		m_SliderA[SLIDER_SETTINGS_AUTOSAVE].SetText(TempString);
 	}
 	else if(hObjSource==m_SliderA[SLIDER_SETTINGS_DIFFICULTY].GetSlider() )
 	{
 		app.SetGameSettings(m_iPad,eGameSetting_Difficulty,pNotifyValueChanged->nValue);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue]));		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue]));		
 		m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetText(TempString);
 		
 		wstring wsText=app.GetString(m_iDifficultySettingA[pNotifyValueChanged->nValue]);
@@ -353,7 +353,7 @@ HRESULT CScene_SettingsOptions::OnControlNavigate(XUIMessageControlNavigate *pCo
 	// added so we can skip greyed out items
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -467,7 +467,7 @@ HRESULT CScene_SettingsOptions::OnTransitionStart( XUIMessageTransition *pTransi
 			// Need to refresh the scenes visual since the object size has now changed
 			XuiControlAttachVisual(m_hObj);
 
-			bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+			bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 			if(bNotInGame)
 			{
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
index da95d084..ab9cc53b 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
@@ -10,9 +10,9 @@
 HRESULT CScene_SettingsUI::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	WCHAR TempString[256];
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 
 	MapChildControls();
@@ -115,7 +115,7 @@ HRESULT CScene_SettingsUI::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotifyVa
 		// slider is 1 to 3
 
 		// is this different from the current value?
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZE ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZE ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_UISIZE].SetText(TempString);
 		if(pNotifyValueChanged->nValue != app.GetGameSettings(m_iPad,eGameSetting_UISize)+1)
 		{
@@ -126,7 +126,7 @@ HRESULT CScene_SettingsUI::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotifyVa
 	}
 	else if(hObjSource==m_SliderA[SLIDER_SETTINGS_UISIZESPLITSCREEN].GetSlider() )
 	{
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZESPLITSCREEN ),pNotifyValueChanged->nValue);		
+		swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZESPLITSCREEN ),pNotifyValueChanged->nValue);		
 		m_SliderA[SLIDER_SETTINGS_UISIZESPLITSCREEN].SetText(TempString);
 
 		if(pNotifyValueChanged->nValue != app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen)+1)
@@ -210,7 +210,7 @@ HRESULT CScene_SettingsUI::OnControlNavigate(XUIMessageControlNavigate *pControl
 	// added so we can skip greyed out items
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest!=NULL)
+	if(pControlNavigateData->hObjDest!=nullptr)
 	{
 		bHandled=TRUE;
 	}
@@ -353,7 +353,7 @@ HRESULT CScene_SettingsUI::OnTransitionStart( XUIMessageTransition *pTransition,
 
 HRESULT CScene_SettingsUI::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// if we're not in the game, we need to use basescene 0 
 	if(bNotInGame)
diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
index 378ac147..963d8f10 100644
--- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
@@ -15,7 +15,7 @@ HRESULT CScene_SignEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	XuiControlSetText(m_ButtonDone,app.GetString(IDS_DONE));
 	XuiControlSetText(m_labelEditSign,app.GetString(IDS_EDIT_SIGN_MESSAGE));
 
-	SignEntryScreenInput* initData = (SignEntryScreenInput*)pInitData->pvInitData;
+	SignEntryScreenInput* initData = static_cast<SignEntryScreenInput *>(pInitData->pvInitData);
 	m_sign = initData->sign;
 	
 	CXuiSceneBase::ShowDarkOverlay( initData->iPad, TRUE );
@@ -75,9 +75,9 @@ HRESULT CScene_SignEntry::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* p
 		if (pMinecraft->level->isClientSide)
 		{
 			shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[pNotifyPressData->UserIndex];
-			if(player != NULL && player->connection && player->connection->isStarted())
+			if(player != nullptr && player->connection && player->connection->isStarted())
 			{
-				player->connection->send( shared_ptr<SignUpdatePacket>( new SignUpdatePacket(m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), m_sign->IsCensored(), m_sign->GetMessages()) ) );
+				player->connection->send(std::make_shared<SignUpdatePacket>(m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), m_sign->IsCensored(), m_sign->GetMessages()));
 			}
 		}
 		app.CloseXuiScenes(pNotifyPressData->UserIndex);
diff --git a/Minecraft.Client/Common/XUI/XUI_SkinSelect.cpp b/Minecraft.Client/Common/XUI/XUI_SkinSelect.cpp
index ee706610..b92159c0 100644
--- a/Minecraft.Client/Common/XUI/XUI_SkinSelect.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SkinSelect.cpp
@@ -26,9 +26,9 @@ WCHAR *CScene_SkinSelect::wchDefaultNamesA[]=
 //----------------------------------------------------------------------------------
 HRESULT CScene_SkinSelect::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 	// if we're not in the game, we need to use basescene 0 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	m_bIgnoreInput=false;
 
 	// 4J Stu - Added this so that we have skins loaded
@@ -46,7 +46,7 @@ HRESULT CScene_SkinSelect::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	m_skinIndex = 0;
 	m_currentSkinPath = app.GetPlayerSkinName(m_iPad);
 	m_originalSkinId = app.GetPlayerSkinId(m_iPad);
-	m_currentPack = NULL;
+	m_currentPack = nullptr;
 	m_bSlidingSkins = false;
 	m_bAnimatingMove = false;
 	currentPackCount = 0;
@@ -86,7 +86,7 @@ HRESULT CScene_SkinSelect::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 			// Change to display the favorites if there are any. The current skin will be in there (probably) - need to check for it
 			m_currentPack = app.m_dlcManager.getPackContainingSkin(m_currentSkinPath);
 			bool bFound;
-			if(m_currentPack != NULL)
+			if(m_currentPack != nullptr)
 			{
 				m_packIndex = app.m_dlcManager.getPackIndex(m_currentPack,bFound,DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
 			}
@@ -232,7 +232,7 @@ HRESULT CScene_SkinSelect::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
 			}
 			break;
 		default:
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				DLCSkinFile *skinFile = m_currentPack->getSkinFile(m_skinIndex);
 				
@@ -266,7 +266,7 @@ HRESULT CScene_SkinSelect::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
 							DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_currentPack->getPurchaseOfferId());
 							ULONGLONG ullOfferID_Full;
 
-							if(pDLCInfo!=NULL)
+							if(pDLCInfo!=nullptr)
 							{
 								ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 							}
@@ -626,8 +626,8 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	wstring skinOrigin = L"";
 	bool bSkinIsFree=false;
 	bool bLicensed=false;
-	DLCSkinFile *skinFile=NULL;
-	DLCPack *Pack=NULL;
+	DLCSkinFile *skinFile=nullptr;
+	DLCPack *Pack=nullptr;
 	BYTE sidePreviewControlsL,sidePreviewControlsR;
 	bool bNoSkinsToShow=false;
 
@@ -635,7 +635,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	m_selectedGroup.SetShow( FALSE );
 	m_skinDetails.SetShow( FALSE );
 
-	if( m_currentPack != NULL )
+	if( m_currentPack != nullptr )
 	{
 		skinFile = m_currentPack->getSkinFile(m_skinIndex);
 		m_selectedSkinPath = skinFile->getPath();
@@ -665,7 +665,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	{	
 		m_selectedSkinPath = L"";
 		m_selectedCapePath = L"";
-		m_vAdditionalSkinBoxes = NULL;
+		m_vAdditionalSkinBoxes = nullptr;
 
 		switch(m_packIndex)
 		{
@@ -753,13 +753,13 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	{
 		// add the boxes to the humanoid model, but only if we've not done this already
 		vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-		if(pAdditionalModelParts==NULL)
+		if(pAdditionalModelParts==nullptr)
 		{
 			pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),m_vAdditionalSkinBoxes);
  		}
   	}
 
-	if(skinFile!=NULL)
+	if(skinFile!=nullptr)
 	{
 		app.SetAnimOverrideBitmask(skinFile->getSkinID(),skinFile->getAnimOverrideBitmask());
 	}
@@ -774,7 +774,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 
 	wstring otherSkinPath = L"";
 	wstring otherCapePath = L"";
-	vector<SKIN_BOX *> *othervAdditionalSkinBoxes=NULL;
+	vector<SKIN_BOX *> *othervAdditionalSkinBoxes=nullptr;
 	wchar_t chars[256];
 
 	// turn off all displays
@@ -820,10 +820,10 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	{
 		if(showNext)
 		{
-			skinFile=NULL;
+			skinFile=nullptr;
 			m_previewNextControls[i]->SetShow(TRUE);
 
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				skinFile = m_currentPack->getSkinFile(nextIndex);
 				otherSkinPath = skinFile->getPath();
@@ -835,7 +835,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 			{	
 				otherSkinPath = L"";
 				otherCapePath = L"";
-				othervAdditionalSkinBoxes=NULL;
+				othervAdditionalSkinBoxes=nullptr;
 				switch(m_packIndex)
 				{
 				case SKIN_SELECT_PACK_DEFAULT:
@@ -867,13 +867,13 @@ void CScene_SkinSelect::handleSkinIndexChanged()
   			if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
   			{
  				vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
- 				if(pAdditionalModelParts==NULL)
+ 				if(pAdditionalModelParts==nullptr)
  				{
  					pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
  				}
   			}
 			// 4J-PB - anim override needs set before SetTexture
-			if(skinFile!=NULL)
+			if(skinFile!=nullptr)
 			{
 				app.SetAnimOverrideBitmask(skinFile->getSkinID(),skinFile->getAnimOverrideBitmask());
 			}			
@@ -892,10 +892,10 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	{
 		if(showPrevious)
 		{
-			skinFile=NULL;
+			skinFile=nullptr;
 			m_previewPreviousControls[i]->SetShow(TRUE);
 
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				skinFile = m_currentPack->getSkinFile(previousIndex);
 				otherSkinPath = skinFile->getPath();
@@ -907,7 +907,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 			{	
 				otherSkinPath = L"";
 				otherCapePath = L"";
-				othervAdditionalSkinBoxes=NULL;
+				othervAdditionalSkinBoxes=nullptr;
 				switch(m_packIndex)
 				{
 				case SKIN_SELECT_PACK_DEFAULT:
@@ -939,7 +939,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
  			if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
  			{
 				vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-				if(pAdditionalModelParts==NULL)
+				if(pAdditionalModelParts==nullptr)
 				{
 					pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
 				}
@@ -957,7 +957,7 @@ void CScene_SkinSelect::handleSkinIndexChanged()
 	}
 
 	// update the tooltips
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	if(bNoSkinsToShow)
 	{
@@ -1001,10 +1001,10 @@ void CScene_SkinSelect::handlePackIndexChanged()
 	}
 	else
 	{
-		m_currentPack = NULL;
+		m_currentPack = nullptr;
 	}
 	m_skinIndex = 0;
-	if(m_currentPack != NULL)
+	if(m_currentPack != nullptr)
 	{
 		bool found;
 		DWORD currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found);
@@ -1021,7 +1021,7 @@ void CScene_SkinSelect::handlePackIndexChanged()
 				DWORD defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
 				if( ugcSkinIndex == 0 )
 				{
-					m_skinIndex = (EDefaultSkins) defaultSkinIndex;
+					m_skinIndex = static_cast<EDefaultSkins>(defaultSkinIndex);
 				}
 			}	
 			break;
@@ -1199,7 +1199,7 @@ int CScene_SkinSelect::getNextSkinIndex(DWORD sourceIndex)
 		{
 			nextSkin = eDefaultSkins_ServerSelected;
 		}
-		else if(m_currentPack != NULL && nextSkin>=m_currentPack->getSkinCount())
+		else if(m_currentPack != nullptr && nextSkin>=m_currentPack->getSkinCount())
 		{
 			nextSkin = 0;
 		}		
@@ -1233,7 +1233,7 @@ int CScene_SkinSelect::getPreviousSkinIndex(DWORD sourceIndex)
 			{
 				previousSkin = eDefaultSkins_Count - 1;
 			}
-			else if(m_currentPack != NULL)
+			else if(m_currentPack != nullptr)
 			{
 				previousSkin = m_currentPack->getSkinCount()-1;
 			}
@@ -1311,7 +1311,7 @@ void CScene_SkinSelect::updateClipping()
 
 int CScene_SkinSelect::UnlockSkinReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	CScene_SkinSelect* pScene = (CScene_SkinSelect*)pParam;
+	CScene_SkinSelect* pScene = static_cast<CScene_SkinSelect *>(pParam);
 #ifdef _XBOX
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -1320,7 +1320,7 @@ int CScene_SkinSelect::UnlockSkinReturned(void *pParam,int iPad,C4JStorage::EMes
 			ULONGLONG ullIndexA[1];
 			DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(pScene->m_currentPack->getPurchaseOfferId());
 
-			if(pDLCInfo!=NULL)
+			if(pDLCInfo!=nullptr)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Full;
 			}
@@ -1330,13 +1330,13 @@ int CScene_SkinSelect::UnlockSkinReturned(void *pParam,int iPad,C4JStorage::EMes
 			}
 
 			// If we're in-game, then we need to enable DLC downloads. They'll be set back to Auto on leaving the pause menu
-			if(Minecraft::GetInstance()->level!=NULL)
+			if(Minecraft::GetInstance()->level!=nullptr)
 			{
 				// need to allow downloads here, or the player would need to quit the game to let the download of a skin pack happen. This might affect the network traffic, since the download could take all the bandwidth...
 				XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
 			}
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 			// the license change coming in when the offer has been installed will cause this scene to refresh	
 		}
@@ -1380,7 +1380,7 @@ HRESULT CScene_SkinSelect::OnCustomMessage_DLCMountingComplete()
 	if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)>0)
 	{
 		m_currentPack = app.m_dlcManager.getPackContainingSkin(m_currentSkinPath);
-		if(m_currentPack != NULL)
+		if(m_currentPack != nullptr)
 		{
 			bool bFound = false;
 			m_packIndex = app.m_dlcManager.getPackIndex(m_currentPack,bFound,DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
@@ -1400,7 +1400,7 @@ HRESULT CScene_SkinSelect::OnCustomMessage_DLCMountingComplete()
 	updateCurrentFocus();
 	m_bIgnoreInput=false;
 	app.m_dlcManager.checkForCorruptDLCAndAlert();
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
+	bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
 
 	if(bInGame) XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
index f237e7d8..2bd84263 100644
--- a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
@@ -21,7 +21,7 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_SocialPost::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad = *(int *)pInitData->pvInitData;
+	m_iPad = *static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 	
@@ -48,8 +48,8 @@ HRESULT CScene_SocialPost::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	wstring wDesc = m_EditDesc.GetText();
 
 	// set the caret to the end of the default text
-	m_EditCaption.SetCaretPosition((int)wCaption.length());
-	m_EditDesc.SetCaretPosition((int)wDesc.length());
+	m_EditCaption.SetCaretPosition(static_cast<int>(wCaption.length()));
+	m_EditDesc.SetCaretPosition(static_cast<int>(wDesc.length()));
 	
 	BOOL bHasAllText = /*( wTitle.length()!=0) && */(wCaption.length()!=0) && (wDesc.length()!=0);
 
@@ -89,7 +89,7 @@ HRESULT CScene_SocialPost::OnControlNavigate(XUIMessageControlNavigate *pControl
 {
 	pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
 
-	if(pControlNavigateData->hObjDest==NULL)
+	if(pControlNavigateData->hObjDest==nullptr)
 	{
 		pControlNavigateData->hObjDest=pControlNavigateData->hObjSource;
 	}
diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
index 1d6ac3bf..bbf0005e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
@@ -21,7 +21,7 @@
 //----------------------------------------------------------------------------------
 HRESULT CScene_Teleport::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	TeleportMenuInitData *initParam = (TeleportMenuInitData *)pInitData->pvInitData;
+	TeleportMenuInitData *initParam = static_cast<TeleportMenuInitData *>(pInitData->pvInitData);
 
 	m_iPad = initParam->iPad;
 	m_teleportToPlayer = initParam->teleportToPlayer;
@@ -51,7 +51,7 @@ HRESULT CScene_Teleport::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
+		if( player != nullptr && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
 		{
 			m_players[m_playersCount] = player->GetSmallId();
 			++m_playersCount;
@@ -125,7 +125,7 @@ HRESULT CScene_Teleport::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pN
 
 void CScene_Teleport::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
-	CScene_Teleport *scene = (CScene_Teleport *)callbackParam;
+	CScene_Teleport *scene = static_cast<CScene_Teleport *>(callbackParam);
 	bool playerFound = false;
 
 	for(int i = 0; i < scene->m_playersCount; ++i)
@@ -167,7 +167,7 @@ HRESULT CScene_Teleport::OnGetSourceDataText(XUIMessageGetSourceText *pGetSource
 		if( pGetSourceTextData->iItem < m_playersCount )
 		{
 			INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId( m_players[pGetSourceTextData->iItem] );
-			if( player != NULL )
+			if( player != nullptr )
 			{
 #ifndef _CONTENT_PACKAGE
 				if(app.DebugSettingsOn() && (app.GetGameSettingsDebugMask()&(1L<<eDebugSetting_DebugLeaderboards)))
@@ -253,7 +253,7 @@ HRESULT CScene_Teleport::OnGetSourceDataText(XUIMessageGetSourceText *pGetSource
 			hr=XuiElementGetChildById(hVisual,L"VoiceGroup",&hVoiceIcon);
 
 			playFrame = -1;
-			if(player != NULL && player->HasVoice() )
+			if(player != nullptr && player->HasVoice() )
 			{
 				if( player->IsMutedByLocalUser(m_iPad) )
 				{
diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
index 0369928b..5eff65e8 100644
--- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
@@ -24,7 +24,7 @@ HRESULT CScene_TextEntry::Init_Commands()
 HRESULT CScene_TextEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	MapChildControls();
-	XuiTextInputParams *params = (XuiTextInputParams *)pInitData->pvInitData;
+	XuiTextInputParams *params = static_cast<XuiTextInputParams *>(pInitData->pvInitData);
 	m_iPad=params->iPad;
 	m_wchInitialChar=params->wch;
 	delete params;
diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
index 5a2e67b4..da224f7a 100644
--- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
@@ -16,7 +16,7 @@
 HRESULT CScene_TransferToXboxOne::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
 	m_iX=-1;
-	m_params = (LoadMenuInitData *)pInitData->pvInitData;
+	m_params = static_cast<LoadMenuInitData *>(pInitData->pvInitData);
 
 	m_iPad=m_params->iPad;
 
@@ -26,9 +26,9 @@ HRESULT CScene_TransferToXboxOne::OnInit( XUIMessageInit* pInitData, BOOL& bHand
 
 	VOID *pObj;
 	XuiObjectFromHandle( m_SavesSlotList, &pObj );
-	m_pSavesSlotList = (CXuiCtrl4JList *)pObj;
+	m_pSavesSlotList = static_cast<CXuiCtrl4JList *>(pObj);
 
-	m_pbImageData=NULL;
+	m_pbImageData=nullptr;
 	m_dwImageBytes=0;
 
 	StorageManager.GetSaveCacheFileInfo(m_params->iSaveGameInfoIndex,m_XContentData);
@@ -48,7 +48,7 @@ HRESULT CScene_TransferToXboxOne::OnInit( XUIMessageInit* pInitData, BOOL& bHand
 
 	// saves will be called slot1 to slotx
 	// there will be a details file with the names and png of each slot
-	m_pbSlotListFile=NULL;
+	m_pbSlotListFile=nullptr;
 	m_uiSlotListFileBytes=0;
 
 	if(StorageManager.TMSPP_InFileList(C4JStorage::eGlobalStorage_TitleUser,m_iPad,L"XboxOne/SlotList"))
@@ -86,7 +86,7 @@ HRESULT CScene_TransferToXboxOne::OnInit( XUIMessageInit* pInitData, BOOL& bHand
 //----------------------------------------------------------------------------------
 int CScene_TransferToXboxOne::TMSPPWriteReturned(LPVOID pParam,int iPad,int iUserData)
 {
-	CScene_TransferToXboxOne* pClass = (CScene_TransferToXboxOne *) pParam;
+	CScene_TransferToXboxOne* pClass = static_cast<CScene_TransferToXboxOne *>(pParam);
 	pClass->m_bWaitingForWrite=false;
 
 	return 0;
@@ -97,13 +97,13 @@ int CScene_TransferToXboxOne::TMSPPWriteReturned(LPVOID pParam,int iPad,int iUse
 //----------------------------------------------------------------------------------
 int CScene_TransferToXboxOne::TMSPPDeleteReturned(LPVOID pParam,int iPad,int iUserData)
 {
-	CScene_TransferToXboxOne* pClass = (CScene_TransferToXboxOne *) pParam;
+	CScene_TransferToXboxOne* pClass = static_cast<CScene_TransferToXboxOne *>(pParam);
 	pClass->m_SavesSlotListTimer.SetShow(FALSE);
 	pClass->m_bIgnoreInput=false;
 
 	// update the slots
 	delete pClass->m_pbSlotListFile;
-	pClass->m_pbSlotListFile=NULL;
+	pClass->m_pbSlotListFile=nullptr;
 	pClass->m_uiSlotListFileBytes=0;
 	pClass->m_pSavesSlotList->RemoveAllData();
 	CXuiCtrl4JList::LIST_ITEM_INFO ListInfo;
@@ -129,7 +129,7 @@ int CScene_TransferToXboxOne::TMSPPDeleteReturned(LPVOID pParam,int iPad,int iUs
 //----------------------------------------------------------------------------------
 int CScene_TransferToXboxOne::TMSPPSlotListReturned(LPVOID pParam,int iPad,int iUserData,C4JStorage::PTMSPP_FILEDATA pFileData, LPCSTR szFilename)
 {
-	CScene_TransferToXboxOne* pClass = (CScene_TransferToXboxOne *) pParam;
+	CScene_TransferToXboxOne* pClass = static_cast<CScene_TransferToXboxOne *>(pParam);
 	unsigned int uiSlotListFileSlots=*((unsigned int *)pFileData->pbData);
 	pClass->m_pbSlotListFile=pFileData->pbData;
 	pClass->m_uiSlotListFileBytes=pFileData->dwSize;
@@ -220,7 +220,7 @@ HRESULT CScene_TransferToXboxOne::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
 		// check if there is a save there
 
 		CXuiCtrl4JList::LIST_ITEM_INFO info = m_pSavesSlotList->GetData(iIndex);
-		if(info.pwszImage!=NULL)
+		if(info.pwszImage!=nullptr)
 		{
 			// we have a save here
 			// Are you sure, etc.
@@ -252,10 +252,10 @@ HRESULT CScene_TransferToXboxOne::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
 
 HRESULT CScene_TransferToXboxOne::BuildSlotFile(int iIndexBeingUpdated,PBYTE pbImageData,DWORD dwImageBytes )
 {
-	SLOTDATA *pCurrentSlotData=NULL;
-	PBYTE pbCurrentSlotDataPtr=NULL;
+	SLOTDATA *pCurrentSlotData=nullptr;
+	PBYTE pbCurrentSlotDataPtr=nullptr;
 	// there may be no slot file yet
-	if(m_pbSlotListFile!=NULL)
+	if(m_pbSlotListFile!=nullptr)
 	{
 		pCurrentSlotData=(SLOTDATA *)(m_pbSlotListFile+sizeof(unsigned int));
 		pbCurrentSlotDataPtr=m_pbSlotListFile + sizeof(unsigned int) + sizeof(SLOTDATA)*m_MaxSlotC;
@@ -298,7 +298,7 @@ HRESULT CScene_TransferToXboxOne::BuildSlotFile(int iIndexBeingUpdated,PBYTE pbI
 		}
 		else
 		{
-			if(pbCurrentSlotDataPtr!=NULL)
+			if(pbCurrentSlotDataPtr!=nullptr)
 			{
 				memcpy(pbNewSlotImageDataPtr,pbCurrentSlotDataPtr,pCurrentSlotData[i].uiImageLength);		
 				pbNewSlotImageDataPtr+=pCurrentSlotData[i].uiImageLength;
@@ -307,7 +307,7 @@ HRESULT CScene_TransferToXboxOne::BuildSlotFile(int iIndexBeingUpdated,PBYTE pbI
 		}
 
 		// move to the next image data in the current slot file
-		if(pbCurrentSlotDataPtr!=NULL)
+		if(pbCurrentSlotDataPtr!=nullptr)
 		{
 			pbCurrentSlotDataPtr+=pCurrentSlotData[i].uiImageLength;
 		}
@@ -323,7 +323,7 @@ HRESULT CScene_TransferToXboxOne::BuildSlotFile(int iIndexBeingUpdated,PBYTE pbI
 	
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CScene_TransferToXboxOne::UploadSaveForXboxOneThreadProc;
-	loadingParams->lpParam = (LPVOID)this;
+	loadingParams->lpParam = static_cast<LPVOID>(this);
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -342,7 +342,7 @@ int CScene_TransferToXboxOne::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
 {
 	HRESULT hr = S_OK;
 	char szFilename[32];
-	CScene_TransferToXboxOne* pClass = (CScene_TransferToXboxOne *) lpParameter;
+	CScene_TransferToXboxOne* pClass = static_cast<CScene_TransferToXboxOne *>(lpParameter);
 	Minecraft *pMinecraft = Minecraft::GetInstance();	
 	unsigned int uiComplete=0;
 	pClass->m_bWaitingForWrite=true;
@@ -415,7 +415,7 @@ int CScene_TransferToXboxOne::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
 		for(int i=0;i<(pClass->m_uiStorageLength/uiChunkSize)+1;i++)
 		{
 			sprintf( szFilename, "XboxOne/Slot%.2d%.2d", pClass->m_uiSlotID,i );
-			PCHAR pchData=((PCHAR)pClass->m_pvSaveMem)+i*uiChunkSize;
+			PCHAR pchData=static_cast<PCHAR>(pClass->m_pvSaveMem)+i*uiChunkSize;
 		
 			pClass->m_bWaitingForWrite=true;
 			if(uiBytesLeft>=uiChunkSize)
@@ -461,7 +461,7 @@ int CScene_TransferToXboxOne::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
 
 int CScene_TransferToXboxOne::LoadSaveDataReturned(void *pParam,bool bContinue)
 {
-	CScene_TransferToXboxOne* pClass = (CScene_TransferToXboxOne*)pParam;
+	CScene_TransferToXboxOne* pClass = static_cast<CScene_TransferToXboxOne *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -502,7 +502,7 @@ HRESULT CScene_TransferToXboxOne::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
 		break;	
 	case VK_PAD_X:
 		// wipe the save slots
-		if(m_pbSlotListFile!=NULL)
+		if(m_pbSlotListFile!=nullptr)
 		{
 			m_SavesSlotListTimer.SetShow(TRUE);
 			m_bIgnoreInput=true;
diff --git a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.cpp b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.cpp
index 51121099..d99df998 100644
--- a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.cpp
@@ -19,7 +19,7 @@ WCHAR *CScene_TrialExitUpsell::wchImages[]=
 //----------------------------------------------------------------------------------
 HRESULT CScene_TrialExitUpsell::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 
 	MapChildControls();
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
index 98951d81..29893d04 100644
--- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
@@ -14,7 +14,7 @@ HRESULT CScene_TutorialPopup::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 {
 	HRESULT hr = S_OK;
 
-	tutorial = (Tutorial *)pInitData->pvInitData;
+	tutorial = static_cast<Tutorial *>(pInitData->pvInitData);
 	m_iPad = tutorial->getPad();
 
 	MapChildControls();
@@ -29,7 +29,7 @@ HRESULT CScene_TutorialPopup::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 	m_textFontSize = _fromString<int>( m_fontSizeControl.GetText() );
 	m_fontSizeControl.SetShow(false);
 
-	m_interactScene = NULL;
+	m_interactScene = nullptr;
 	m_lastSceneMovedLeft = false;
 	m_bAllowFade = false;
 
@@ -63,7 +63,7 @@ HRESULT CScene_TutorialPopup::OnTimer(XUIMessageTimer *pData,BOOL& rfHandled)
 
 void CScene_TutorialPopup::UpdateInteractScenePosition(bool visible)
 {
-	if( m_interactScene == NULL ) return;
+	if( m_interactScene == nullptr ) return;
 
 	// 4J-PB - check this players screen section to see if we should allow the animation
 	bool bAllowAnim=false;
@@ -146,8 +146,8 @@ HRESULT CScene_TutorialPopup::_SetDescription(CXuiScene *interactScene, LPCWSTR
 {	
 	HRESULT hr = S_OK;
 	m_interactScene = interactScene;
-	if( interactScene != m_lastInteractSceneMoved ) m_lastInteractSceneMoved = NULL;
-	if(desc == NULL)
+	if( interactScene != m_lastInteractSceneMoved ) m_lastInteractSceneMoved = nullptr;
+	if(desc == nullptr)
 	{
 		SetShow( false );
 		XuiSetTimer(m_hObj,TUTORIAL_POPUP_MOVE_SCENE_TIMER_ID,TUTORIAL_POPUP_MOVE_SCENE_TIME);
@@ -195,7 +195,7 @@ HRESULT CScene_TutorialPopup::_SetDescription(CXuiScene *interactScene, LPCWSTR
 		hr = XuiElementGetPosition( m_title, &titlePos );
 
 		BOOL titleShowAtStart = m_title.IsShown();
-		if( title != NULL && title[0] != 0 )
+		if( title != nullptr && title[0] != 0 )
 		{
 			m_title.SetText( title );
 			m_title.SetShow(TRUE);
@@ -241,7 +241,7 @@ HRESULT CScene_TutorialPopup::_SetDescription(CXuiScene *interactScene, LPCWSTR
 		SetBounds(fWidth, fHeight + heightDiff);
 
 		m_description.GetBounds(&fWidth,&fHeight);
-		m_description.SetBounds(fWidth, (float)(contentDims.nPageHeight + heightDiff));
+		m_description.SetBounds(fWidth, static_cast<float>(contentDims.nPageHeight + heightDiff));
 	}
 	return hr;
 }
@@ -269,7 +269,7 @@ HRESULT CScene_TutorialPopup::SetDescription(int iPad, TutorialPopupInfo *info)
 		parsed = CScene_TutorialPopup::ParseDescription(iPad, parsed);
 		if(parsed.empty())
 		{
-			hr = pThis->_SetDescription( info->interactScene, NULL, NULL, info->allowFade, info->isReminder );
+			hr = pThis->_SetDescription( info->interactScene, nullptr, nullptr, info->allowFade, info->isReminder );
 		}
 		else
 		{
@@ -289,7 +289,7 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS
 	if( icon != TUTORIAL_NO_ICON )
 	{
 		bool itemIsFoil = false;
-		itemIsFoil = (shared_ptr<ItemInstance>(new ItemInstance(icon,1,iAuxVal)))->isFoil();
+		itemIsFoil = (std::make_shared<ItemInstance>(icon, 1, iAuxVal))->isFoil();
 		if(!itemIsFoil) itemIsFoil = isFoil;
 
 		m_pCraftingPic->SetIcon(m_iPad, icon,iAuxVal,1,10,31,false,itemIsFoil);
@@ -298,13 +298,13 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS
 	{
 		wstring openTag(L"{*ICON*}");
 		wstring closeTag(L"{*/ICON*}");
-		int iconTagStartPos = (int)temp.find(openTag);
-		int iconStartPos = iconTagStartPos + (int)openTag.length();
-		if( iconTagStartPos > 0 && iconStartPos < (int)temp.length() )
+		size_t iconTagStartPos = temp.find(openTag);
+		size_t iconStartPos = iconTagStartPos + openTag.length();
+		if( iconTagStartPos > 0 && iconStartPos < temp.length() )
 		{
-			int iconEndPos = (int)temp.find( closeTag, iconStartPos );
+			size_t iconEndPos = temp.find(closeTag, iconStartPos);
 
-			if(iconEndPos > iconStartPos && iconEndPos < (int)temp.length() )
+			if(iconEndPos > iconStartPos && iconEndPos < temp.length() )
 			{
 				wstring id = temp.substr(iconStartPos, iconEndPos - iconStartPos);
 
@@ -322,7 +322,7 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS
 				}
 
 				bool itemIsFoil = false;
-				itemIsFoil = (shared_ptr<ItemInstance>(new ItemInstance(iconId,1,iAuxVal)))->isFoil();
+				itemIsFoil = (std::make_shared<ItemInstance>(iconId, 1, iAuxVal))->isFoil();
 				if(!itemIsFoil) itemIsFoil = isFoil;
 
 				m_pCraftingPic->SetIcon(m_iPad, iconId,iAuxVal,1,10,31,false,itemIsFoil);
@@ -443,13 +443,13 @@ wstring CScene_TutorialPopup::_SetImage(wstring &desc)
 
 	wstring openTag(L"{*IMAGE*}");
 	wstring closeTag(L"{*/IMAGE*}");
-	int imageTagStartPos = (int)desc.find(openTag);
-	int imageStartPos = imageTagStartPos + (int)openTag.length();
-	if( imageTagStartPos > 0 && imageStartPos < (int)desc.length() )
+	size_t imageTagStartPos = desc.find(openTag);
+	size_t imageStartPos = imageTagStartPos + openTag.length();
+	if( imageTagStartPos > 0 && imageStartPos < desc.length() )
 	{
-		int imageEndPos = (int)desc.find( closeTag, imageStartPos );
+		size_t imageEndPos = desc.find(closeTag, imageStartPos);
 
-		if(imageEndPos > imageStartPos && imageEndPos < (int)desc.length() )
+		if(imageEndPos > imageStartPos && imageEndPos < desc.length() )
 		{
 			wstring id = desc.substr(imageStartPos, imageEndPos - imageStartPos);
 			m_image.SetImagePath( id.c_str() );
@@ -564,7 +564,7 @@ HRESULT CScene_TutorialPopup::SetSceneVisible(int iPad, bool show)
 	if( XuiClassDerivesFrom( objClass, thisClass ) )
 	{
 		CScene_TutorialPopup *pThis;
-		hr = XuiObjectFromHandle(hObj, (void **) &pThis);
+		hr = XuiObjectFromHandle(hObj, static_cast<void **>(&pThis));
 		if (FAILED(hr))
 			return hr;
 
@@ -593,7 +593,7 @@ bool CScene_TutorialPopup::IsSceneVisible(int iPad)
 	if( XuiClassDerivesFrom( objClass, thisClass ) )
 	{
 		CScene_TutorialPopup *pThis;
-		hr = XuiObjectFromHandle(hObj, (void **) &pThis);
+		hr = XuiObjectFromHandle(hObj, static_cast<void **>(&pThis));
 		if (FAILED(hr))
 			return false;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Common/XUI/XUI_debug.cpp
index 61b818a0..9aee3888 100644
--- a/Minecraft.Client/Common/XUI/XUI_debug.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_debug.cpp
@@ -50,7 +50,7 @@ LPCWSTR CScene_Debug::m_DebugButtonTextA[eDebugButton_Max+1]=
 //----------------------------------------------------------------------------------
 HRESULT CScene_Debug::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
-	m_iPad=*(int *)pInitData->pvInitData;
+	m_iPad=*static_cast<int *>(pInitData->pvInitData);
 
 	// set text and enable any debug options required
 	int iCheckboxIndex=0;
@@ -89,7 +89,7 @@ HRESULT CScene_Debug::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 			XuiCreateObject( XUI_CLASS_CHECKBOX, &m_DebugCheckboxDataA[iCheckboxIndex].hXuiObj );
 			XuiObjectFromHandle( m_DebugCheckboxDataA[iCheckboxIndex].hXuiObj, &m_DebugCheckboxDataA[iCheckboxIndex].pvData );
 
-			pCheckbox = (CXuiCheckbox *)m_DebugCheckboxDataA[iCheckboxIndex].pvData;
+			pCheckbox = static_cast<CXuiCheckbox *>(m_DebugCheckboxDataA[iCheckboxIndex].pvData);
 			//m_phXuiObjA[iElementIndex] = pCheckbox->m_hObj;
 			pCheckbox->SetText(m_DebugCheckboxTextA[iCheckboxIndex]);
 			pCheckbox->SetShow(TRUE);
@@ -139,7 +139,7 @@ HRESULT CScene_Debug::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 		XuiCreateObject( XUI_CLASS_BUTTON, &m_DebugButtonDataA[iButtonIndex].hXuiObj );
 		XuiObjectFromHandle( m_DebugButtonDataA[iButtonIndex].hXuiObj, &m_DebugButtonDataA[iButtonIndex].pvData );
 
-		pButton = (CXuiControl *)m_DebugButtonDataA[iButtonIndex].pvData;
+		pButton = static_cast<CXuiControl *>(m_DebugButtonDataA[iButtonIndex].pvData);
 		//m_phXuiObjA[iElementIndex] = pCheckbox->m_hObj;
 		pButton->SetText(m_DebugButtonTextA[iButtonIndex]);
 		pButton->SetShow(TRUE);
@@ -171,7 +171,7 @@ HRESULT CScene_Debug::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	for(int i=0;i<iCheckboxIndex;i++)
 	{
-		CXuiCheckbox *pCheckbox = (CXuiCheckbox *)m_DebugCheckboxDataA[i].pvData;
+		CXuiCheckbox *pCheckbox = static_cast<CXuiCheckbox *>(m_DebugCheckboxDataA[i].pvData);
 		pCheckbox->SetCheck( (uiDebugBitmask&(1<<i)) ?TRUE:FALSE);
 	}
 
@@ -213,7 +213,7 @@ HRESULT CScene_Debug::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 		// check all the settings
 		for(int i=0;i<m_iTotalCheckboxElements;i++)
 		{
-			CXuiCheckbox *pCheckbox = (CXuiCheckbox *)m_DebugCheckboxDataA[i].pvData;
+			CXuiCheckbox *pCheckbox = static_cast<CXuiCheckbox *>(m_DebugCheckboxDataA[i].pvData);
 			uiDebugBitmask|=pCheckbox->IsChecked()?(1<<iCurrentBitmaskIndex):0;
 			iCurrentBitmaskIndex++;
 		}
diff --git a/Minecraft.Client/Common/zlib/adler32.c b/Minecraft.Client/Common/zlib/adler32.c
index 33d70c60..c41e5e6f 100644
--- a/Minecraft.Client/Common/zlib/adler32.c
+++ b/Minecraft.Client/Common/zlib/adler32.c
@@ -1,178 +1,164 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-#include "zutil.h"
-
-#define local static
-
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
-#define BASE 65521      /* 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(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt 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);
-}
-
-/* ========================================================================= */
-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 >= (BASE << 1)) sum2 -= (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);
-}
+/* 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"

+

+#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(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(uLong adler, const Bytef *buf, uInt len) {

+    return adler32_z(adler, buf, len);

+}

+

+/* ========================================================================= */

+local uLong adler32_combine_(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(uLong adler1, uLong adler2, z_off_t len2) {

+    return adler32_combine_(adler1, adler2, len2);

+}

+

+uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {

+    return adler32_combine_(adler1, adler2, len2);

+}

diff --git a/Minecraft.Client/Common/zlib/compress.c b/Minecraft.Client/Common/zlib/compress.c
index 6f3f2593..aff0cb95 100644
--- a/Minecraft.Client/Common/zlib/compress.c
+++ b/Minecraft.Client/Common/zlib/compress.c
@@ -1,81 +1,99 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * 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;
-
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = deflateEnd(&stream);
-    return 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;
-}
+/* compress.c -- compress a memory buffer

+ * Copyright (C) 1995-2026 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.

+

+     The _z versions of the functions take size_t length arguments.

+*/

+int ZEXPORT compress2_z(Bytef *dest, z_size_t *destLen, const Bytef *source,

+                        z_size_t sourceLen, int level) {

+    z_stream stream;

+    int err;

+    const uInt max = (uInt)-1;

+    z_size_t left;

+

+    if ((sourceLen > 0 && source == NULL) ||

+        destLen == NULL || (*destLen > 0 && dest == NULL))

+        return Z_STREAM_ERROR;

+

+    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 > (z_size_t)max ? max : (uInt)left;

+            left -= stream.avail_out;

+        }

+        if (stream.avail_in == 0) {

+            stream.avail_in = sourceLen > (z_size_t)max ? max :

+                                                          (uInt)sourceLen;

+            sourceLen -= stream.avail_in;

+        }

+        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);

+    } while (err == Z_OK);

+

+    *destLen = (z_size_t)(stream.next_out - dest);

+    deflateEnd(&stream);

+    return err == Z_STREAM_END ? Z_OK : err;

+}

+int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,

+                      uLong sourceLen, int level) {

+    int ret;

+    z_size_t got = *destLen;

+    ret = compress2_z(dest, &got, source, sourceLen, level);

+    *destLen = (uLong)got;

+    return ret;

+}

+/* ===========================================================================

+ */

+int ZEXPORT compress_z(Bytef *dest, z_size_t *destLen, const Bytef *source,

+                       z_size_t sourceLen) {

+    return compress2_z(dest, destLen, source, sourceLen,

+                       Z_DEFAULT_COMPRESSION);

+}

+int ZEXPORT compress(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.

+ */

+z_size_t ZEXPORT compressBound_z(z_size_t sourceLen) {

+    z_size_t bound = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +

+                     (sourceLen >> 25) + 13;

+    return bound < sourceLen ? (z_size_t)-1 : bound;

+}

+uLong ZEXPORT compressBound(uLong sourceLen) {

+    z_size_t bound = compressBound_z(sourceLen);

+    return (uLong)bound != bound ? (uLong)-1 : (uLong)bound;

+}

diff --git a/Minecraft.Client/Common/zlib/crc32.c b/Minecraft.Client/Common/zlib/crc32.c
index 979a7190..d9ade515 100644
--- a/Minecraft.Client/Common/zlib/crc32.c
+++ b/Minecraft.Client/Common/zlib/crc32.c
@@ -1,12 +1,10 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ * 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$ */
@@ -14,412 +12,972 @@
 /*
   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
+  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().
 
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+  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 */
+#  endif
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+#  define Z_ONCE
+#endif
 
-#include "zutil.h"      /* for STDC and FAR definitions */
+#include "zutil.h"      /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
 
-#define local static
+#ifdef HAVE_S390X_VX
+#  include "contrib/crc32vx/crc32_vx_hooks.h"
+#endif
+
+ /*
+  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.
+ */
 
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
+/* 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
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-#  define TBLS 8
+
+/*
+  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
-#  define TBLS 1
-#endif /* BYFOUR */
+#  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
 
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && \
+    defined(W) && W == 8
+#  define ARMCRC32
+#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(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
 
 #ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Table of powers of x for combining CRC-32s, filled in by make_crc_table()
+ * below.
+ */
+   local z_crc_t FAR x2n_table[32];
+#else
+/* =========================================================================
+ * 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
 
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
+/* CRC polynomial. */
+#define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
+
+/*
+  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 uLong multmodp(uLong a, uLong b) {
+    uLong m, p;
+
+    m = (uLong)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. n must not be negative.
+ */
+local uLong x2nmodp(z_off64_t n, unsigned k) {
+    uLong p;
+
+    p = (uLong)1 << 31;             /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
+
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Build the tables for byte-wise and braided CRC-32 calculations, and a table
+ * of powers of x for combining CRC-32s.
+ */
+local z_crc_t FAR crc_table[256];
+#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(z_crc_t [][256], z_word_t [][256], int, int);
+#endif
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
+   local void write_table(FILE *, const z_crc_t FAR *, int);
+   local void write_table32hi(FILE *, const z_word_t FAR *, int);
+   local void write_table64(FILE *, const z_word_t FAR *, int);
 #endif /* MAKECRCH */
+
+/* State for once(). */
+local z_once_t made = Z_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
+  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
+  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+1), then the CRC is (q*x^32) mod p,
+  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
+  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 first 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.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
+  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.
+ */
 
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
+local void make_crc_table(void) {
+    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 = (z_crc_t)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
-    /* write out CRC tables to crc32.h */
     {
+        /*
+          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;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
+
+        /* 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, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\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
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
+
+/*
+   Write the 32-bit values in table[0..k-1] to out, five per line in
+   hexadecimal separated by commas.
+ */
+local void write_table(FILE *out, const z_crc_t FAR *table, int k) {
     int n;
 
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
                 (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\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(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(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(void) {
+    make_crc_table();
+    return 0;
+}
+
 #endif /* MAKECRCH */
 
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+#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.
  */
-#include "crc32.h"
+local void braid(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 = (z_crc_t)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 = (z_crc_t)multmodp(i << 24, p);
+            big[w - 1 - k][i] = byte_swap(q);
+        }
+    }
+}
+#endif
+
 #endif /* DYNAMIC_CRC_TABLE */
 
 /* =========================================================================
- * This function can be used by asm versions of crc32()
+ * 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()
-{
+const z_crc_t FAR * ZEXPORT get_crc_table(void) {
 #ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
+    z_once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
     return (const z_crc_t FAR *)crc_table;
 }
 
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+/* =========================================================================
+ * 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
 
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    if (buf == Z_NULL) return 0UL;
+/*
+   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 */
+
+uLong ZEXPORT crc32_z(uLong crc, const unsigned char FAR *buf, z_size_t len) {
+    uLong 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
-    if (crc_table_empty)
-        make_crc_table();
+    z_once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
 
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
 
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
+    /* 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));
     }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
+
+    /* 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;
     }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
 
-#ifdef BYFOUR
+    /* 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((int)last, 6);
+        crc = multmodp(val, crc) ^ crc1;
+        crc = multmodp(val, crc) ^ crc2;
+    }
 
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+    /* 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;
 
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    /* 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));
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
 
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
+#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(z_word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data >> 8) ^ crc_table[data & 0xff];
+    return (z_crc_t)data;
 }
 
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+local z_word_t crc_word_big(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
 
 /* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
+uLong ZEXPORT crc32_z(uLong 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
+    z_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 endianness at execution time. If the
+           compiler knows what the endianness 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;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    buf4--;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
+#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 >= 4) {
-        DOBIG4;
-        len -= 4;
+    while (len) {
+        len--;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
     }
-    buf4++;
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
-}
 
-#endif /* BYFOUR */
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
 
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+#endif
 
 /* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
+uLong ZEXPORT crc32(uLong crc, const unsigned char FAR *buf, uInt len) {
+    #ifdef HAVE_S390X_VX
+    return crc32_z_hook(crc, buf, len);
+    #endif
+    return crc32_z(crc, buf, len);
 }
 
 /* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
+uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
+    if (len2 < 0)
+        return 0;
+#ifdef DYNAMIC_CRC_TABLE
+    z_once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return x2nmodp(len2, 3);
 }
 
 /* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
+uLong ZEXPORT crc32_combine_gen(z_off_t len2) {
+    return crc32_combine_gen64((z_off64_t)len2);
+}
 
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) {
+    if (op == 0)
+        return 0;
+    return multmodp(op, crc1 & 0xffffffff) ^ (crc2 & 0xffffffff);
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
+uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
+    return crc32_combine_op(crc1, crc2, crc32_combine_gen64(len2));
 }
 
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
 }
diff --git a/Minecraft.Client/Common/zlib/crc32.h b/Minecraft.Client/Common/zlib/crc32.h
index 9e0c7781..57de293a 100644
--- a/Minecraft.Client/Common/zlib/crc32.h
+++ b/Minecraft.Client/Common/zlib/crc32.h
@@ -1,441 +1,9446 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const z_crc_t FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};
+/* 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/Minecraft.Client/Common/zlib/deflate.c b/Minecraft.Client/Common/zlib/deflate.c
index 69695770..35e961a3 100644
--- a/Minecraft.Client/Common/zlib/deflate.c
+++ b/Minecraft.Client/Common/zlib/deflate.c
@@ -1,1967 +1,2185 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2013 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.8 Copyright 1995-2013 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 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 int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef 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.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to 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 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) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-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;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    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;
-        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) {
-        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->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = 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 */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    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->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-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 (strm == Z_NULL || strm->state == Z_NULL || 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 deflateResetKeep (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-        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 = s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _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 (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (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 (strm == Z_NULL || strm->state == Z_NULL) 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 (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    if ((Bytef *)(s->d_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;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) 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) &&
-        strm->total_in != 0) {
-        /* Flush the last buffer: */
-        err = deflate(strm, Z_BLOCK);
-        if (err == Z_BUF_ERROR && s->pending == 0)
-            err = Z_OK;
-    }
-    if (s->level != level) {
-        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 err;
-}
-
-/* ========================================================================= */
-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 (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = good_length;
-    s->max_lazy_match = max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = 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.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong complen, wraplen;
-    Bytef *str;
-
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return complen + 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;
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            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;
-    default:                                /* for compiler happiness */
-        wraplen = 6;
-    }
-
-    /* if not default parameters, return conservative bound */
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
-
-    /* default settings: return tight bound for that case */
-    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 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;
-    }
-}
-
-/* ========================================================================= */
-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 (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_BLOCK || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-#ifdef GZIP
-        if (s->wrap == 2) {
-            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;
-            }
-            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;
-            }
-        }
-        else
-#endif
-        {
-            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);
-
-            s->status = BUSY_STATE;
-            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);
-        }
-    }
-#ifdef GZIP
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-
-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size)
-                        break;
-                }
-                put_byte(s, s->gzhead->extra[s->gzindex]);
-                s->gzindex++;
-            }
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (s->gzindex == s->gzhead->extra_len) {
-                s->gzindex = 0;
-                s->status = NAME_STATE;
-            }
-        }
-        else
-            s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0) {
-                s->gzindex = 0;
-                s->status = COMMENT_STATE;
-            }
-        }
-        else
-            s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0)
-                s->status = HCRC_STATE;
-        }
-        else
-            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 + 2 <= s->pending_buf_size) {
-                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;
-            }
-        }
-        else
-            s->status = BUSY_STATE;
-    }
-#endif
-
-    /* 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);
-    }
-
-    /* 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->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;
-            }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    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 (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* 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;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == 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));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    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->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*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 int 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 (int)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
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#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.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-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 = 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 = 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;
-}
-#endif /* ASMV */
-
-#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 DEBUG
-/* ===========================================================================
- * 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 /* 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;
-{
-    register unsigned n, m;
-    register Posf *p;
-    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);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (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. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            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
-            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; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-                   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-        Assert(s->block_start >= 0L, "block gone");
-
-        s->strstart += s->lookahead;
-        s->lookahead = 0;
-
-        /* Emit a stored block if pending_buf will be full: */
-        max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-            /* strstart == 0 is possible when wraparound on 16-bit machine */
-            s->lookahead = (uInt)(s->strstart - max_start);
-            s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-        }
-        /* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-        }
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if ((long)s->strstart > s->block_start)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-/* ===========================================================================
- * 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->last_lit)
-        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->last_lit)
-        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 - (int)(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->last_lit)
-        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->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
+/* deflate.c -- compress data using the deflation algorithm

+ * Copyright (C) 1995-2026 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 at https://datatracker.ietf.org/doc/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.3.2.1 Copyright 1995-2026 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.

+ */

+

+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)(deflate_state *s, int flush);

+/* Compression function. Returns the block state after the call. */

+

+local block_state deflate_stored(deflate_state *s, int flush);

+local block_state deflate_fast(deflate_state *s, int flush);

+#ifndef FASTEST

+local block_state deflate_slow(deflate_state *s, int flush);

+#endif

+local block_state deflate_rle(deflate_state *s, int flush);

+local block_state deflate_huff(deflate_state *s, int flush);

+

+/* ===========================================================================

+ * 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(s->head, (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \

+        s->slid = 0; \

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

+ */

+#if defined(__has_feature)

+#  if __has_feature(memory_sanitizer)

+     __attribute__((no_sanitize("memory")))

+#  endif

+#endif

+local void slide_hash(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);

+#ifndef FASTEST

+    n = wsize;

+    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

+    s->slid = 1;

+}

+

+/* ===========================================================================

+ * 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(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;

+}

+

+/* ===========================================================================

+ * 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(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: */

+#ifdef _MSC_VER

+#pragma warning(push)

+#pragma warning(disable: 4127)

+#endif

+        if (sizeof(int) <= 2) {

+#ifdef _MSC_VER

+#pragma warning(pop)

+#endif

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

+}

+

+/* ========================================================================= */

+int ZEXPORT deflateInit_(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_(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;

+    zmemzero(s, sizeof(deflate_state));

+    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, LIT_BUFS);

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

+    }

+#ifdef LIT_MEM

+    s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1));

+    s->l_buf = s->pending_buf + (s->lit_bufsize << 2);

+    s->sym_end = s->lit_bufsize - 1;

+#else

+    s->sym_buf = s->pending_buf + s->lit_bufsize;

+    s->sym_end = (s->lit_bufsize - 1) * 3;

+#endif

+    /* 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(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(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(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(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;

+}

+

+/* ===========================================================================

+ * Initialize the "longest match" routines for a new zlib stream

+ */

+local void lm_init(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;

+}

+

+/* ========================================================================= */

+int ZEXPORT deflateReset(z_streamp strm) {

+    int ret;

+

+    ret = deflateResetKeep(strm);

+    if (ret == Z_OK)

+        lm_init(strm->state);

+    return ret;

+}

+

+/* ========================================================================= */

+int ZEXPORT deflateSetHeader(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(z_streamp strm, unsigned *pending, int *bits) {

+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;

+    if (bits != Z_NULL)

+        *bits = strm->state->bi_valid;

+    if (pending != Z_NULL) {

+        *pending = (unsigned)strm->state->pending;

+        if (*pending != strm->state->pending) {

+            *pending = (unsigned)-1;

+            return Z_BUF_ERROR;

+        }

+    }

+    return Z_OK;

+}

+

+/* ========================================================================= */

+int ZEXPORT deflateUsed(z_streamp strm, int *bits) {

+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;

+    if (bits != Z_NULL)

+        *bits = strm->state->bi_used;

+    return Z_OK;

+}

+

+/* ========================================================================= */

+int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) {

+    deflate_state *s;

+    int put;

+

+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;

+    s = strm->state;

+#ifdef LIT_MEM

+    if (bits < 0 || bits > 16 ||

+        (uchf *)s->d_buf < s->pending_out + ((Buf_size + 7) >> 3))

+        return Z_BUF_ERROR;

+#else

+    if (bits < 0 || bits > 16 ||

+        s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))

+        return Z_BUF_ERROR;

+#endif

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

+ */

+z_size_t ZEXPORT deflateBound_z(z_streamp strm, z_size_t sourceLen) {

+    deflate_state *s;

+    z_size_t fixedlen, storelen, wraplen, bound;

+

+    /* 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;

+    if (fixedlen < sourceLen)

+        fixedlen = (z_size_t)-1;

+

+    /* 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 (storelen < sourceLen)

+        storelen = (z_size_t)-1;

+

+    /* if can't get parameters, return larger bound plus a wrapper */

+    if (deflateStateCheck(strm)) {

+        bound = fixedlen > storelen ? fixedlen : storelen;

+        return bound + 18 < bound ? (z_size_t)-1 : bound + 18;

+    }

+

+    /* compute wrapper length */

+    s = strm->state;

+    switch (s->wrap < 0 ? -s->wrap : 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 = 18;

+    }

+

+    /* if not default parameters, return one of the conservative bounds */

+    if (s->w_bits != 15 || s->hash_bits != 8 + 7) {

+        bound = s->w_bits <= s->hash_bits && s->level ? fixedlen :

+                                                        storelen;

+        return bound + wraplen < bound ? (z_size_t)-1 : bound + wraplen;

+    }

+

+    /* default settings: return tight bound for that case -- ~0.03% overhead

+       plus a small constant */

+    bound = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +

+            (sourceLen >> 25) + 13 - 6 + wraplen;

+    return bound < sourceLen ? (z_size_t)-1 : bound;

+}

+uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {

+    z_size_t bound = deflateBound_z(strm, sourceLen);

+    return (uLong)bound != bound ? (uLong)-1 : (uLong)bound;

+}

+

+/* =========================================================================

+ * 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(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(z_streamp strm) {

+    unsigned len;

+    deflate_state *s = strm->state;

+

+    _tr_flush_bits(s);

+    len = s->pending > strm->avail_out ? strm->avail_out :

+                                         (unsigned)s->pending;

+    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_z(strm->adler, s->pending_buf + (beg), \

+                                  s->pending - (beg)); \

+    } while (0)

+

+/* ========================================================================= */

+int ZEXPORT deflate(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_z(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 */

+            ulg left = (s->gzhead->extra_len & 0xffff) - s->gzindex;

+            while (s->pending + left > s->pending_buf_size) {

+                ulg 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(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(z_streamp dest, z_streamp source) {

+#ifdef MAXSEG_64K

+    (void)dest;

+    (void)source;

+    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(dest, source, sizeof(z_stream));

+

+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));

+    if (ds == Z_NULL) return Z_MEM_ERROR;

+    zmemzero(ds, sizeof(deflate_state));

+    dest->state = (struct internal_state FAR *) ds;

+    zmemcpy(ds, 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, LIT_BUFS);

+

+    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's do not work for 16-bit MSDOS */

+    zmemcpy(ds->window, ss->window, ss->high_water);

+    zmemcpy(ds->prev, ss->prev,

+            (ss->slid || ss->strstart - ss->insert > ds->w_size ? ds->w_size :

+                ss->strstart - ss->insert) * sizeof(Pos));

+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));

+

+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);

+    zmemcpy(ds->pending_out, ss->pending_out, ss->pending);

+#ifdef LIT_MEM

+    ds->d_buf = (ushf *)(ds->pending_buf + (ds->lit_bufsize << 1));

+    ds->l_buf = ds->pending_buf + (ds->lit_bufsize << 2);

+    zmemcpy(ds->d_buf, ss->d_buf, ss->sym_next * sizeof(ush));

+    zmemcpy(ds->l_buf, ss->l_buf, ss->sym_next);

+#else

+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;

+    zmemcpy(ds->sym_buf, ss->sym_buf, ss->sym_next);

+#endif

+

+    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 */

+}

+

+#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(deflate_state *s, IPos cur_match) {

+    unsigned chain_length = s->max_chain_length;/* max hash chain length */

+    Bytef *scan = s->window + s->strstart;      /* current string */

+    Bytef *match;                               /* matched string */

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

+     */

+    Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;

+    ush scan_start = *(ushf*)scan;

+    ush scan_end   = *(ushf*)(scan + best_len - 1);

+#else

+    Bytef *strend = s->window + s->strstart + MAX_MATCH;

+    Byte scan_end1  = scan[best_len - 1];

+    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(deflate_state *s, IPos cur_match) {

+    Bytef *scan = s->window + s->strstart;      /* current string */

+    Bytef *match;                               /* matched string */

+    int len;                                    /* length of current match */

+    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(deflate_state *s, IPos start, IPos match, int length) {

+    /* check that the match is indeed a match */

+    Bytef *back = s->window + (int)match, *here = s->window + start;

+    IPos len = (IPos)length;

+    if (match == (IPos)-1) {

+        /* match starts one byte before the current window -- just compare the

+           subsequent length-1 bytes */

+        back++;

+        here++;

+        len--;

+    }

+    if (zmemcmp(back, here, len) != EQUAL) {

+        fprintf(stderr, " start %u, match %d, length %d\n",

+                start, (int)match, length);

+        do {

+            fprintf(stderr, "(%02x %02x)", *back++, *here++);

+        } while (--len != 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 */

+

+/* ===========================================================================

+ * 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(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 = (unsigned)(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.

+     */

+    int last = 0;

+    unsigned len, left, have;

+    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 = ((unsigned)s->bi_valid + 42) >> 3;   /* bytes in header */

+        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 = (unsigned)(s->strstart - s->block_start);    /* window bytes */

+        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] = (Bytef)len;

+        s->pending_buf[s->pending - 3] = (Bytef)(len >> 8);

+        s->pending_buf[s->pending - 2] = (Bytef)~len;

+        s->pending_buf[s->pending - 1] = (Bytef)(~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) {

+        s->bi_used = 8;

+        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 = (unsigned)(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 = ((unsigned)s->bi_valid + 42) >> 3;   /* bytes in header */

+        /* maximum stored block length that will fit in pending: */

+    have = (unsigned)MIN(s->pending_buf_size - have, MAX_STORED);

+    min_block = MIN(have, s->w_size);

+    left = (unsigned)(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. */

+    if (last)

+        s->bi_used = 8;

+    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(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, (int)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(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, (int)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(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, (int)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(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/Minecraft.Client/Common/zlib/deflate.h b/Minecraft.Client/Common/zlib/deflate.h
index ce0299ed..2607c2f6 100644
--- a/Minecraft.Client/Common/zlib/deflate.h
+++ b/Minecraft.Client/Common/zlib/deflate.h
@@ -1,346 +1,383 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 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
-#define EXTRA_STATE   69
-#define NAME_STATE    73
-#define COMMENT_STATE 91
-#define HCRC_STATE   103
-#define BUSY_STATE   113
-#define FINISH_STATE 666
-/* 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 */
-    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 */
-    uInt   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 */
-    uInt   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 *l_buf;          /* buffer for literals or 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 last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    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 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++] = (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 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->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#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 */
+/* deflate.h -- internal compression state

+ * Copyright (C) 1995-2026 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

+

+/* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at

+   the cost of a larger memory footprint */

+/* #define LIT_MEM */

+

+/* ===========================================================================

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

+     */

+

+#ifdef LIT_MEM

+#   define LIT_BUFS 5

+    ushf *d_buf;          /* buffer for distances */

+    uchf *l_buf;          /* buffer for literals/lengths */

+#else

+#   define LIT_BUFS 4

+    uchf *sym_buf;        /* buffer for distances and literals/lengths */

+#endif

+

+    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 symbol buffer */

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

+     */

+    int bi_used;

+    /* Last number of used bits when going to a byte boundary.

+     */

+

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

+     */

+

+    int slid;

+    /* True if the hash table has been slid since it was cleared. */

+

+} 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(deflate_state *s);

+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc);

+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,

+                                   ulg stored_len, int last);

+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s);

+void ZLIB_INTERNAL _tr_align(deflate_state *s);

+void ZLIB_INTERNAL _tr_stored_block(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

+

+#ifdef LIT_MEM

+# define _tr_tally_lit(s, c, flush) \

+  { uch cc = (c); \

+    s->d_buf[s->sym_next] = 0; \

+    s->l_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->d_buf[s->sym_next] = dist; \

+    s->l_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) \

+  { 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); \

+  }

+#endif

+#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/Minecraft.Client/Common/zlib/gzclose.c b/Minecraft.Client/Common/zlib/gzclose.c
index caeb99a3..faf4fb55 100644
--- a/Minecraft.Client/Common/zlib/gzclose.c
+++ b/Minecraft.Client/Common/zlib/gzclose.c
@@ -1,25 +1,23 @@
-/* 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
-}
+/* 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(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/Minecraft.Client/Common/zlib/gzguts.h b/Minecraft.Client/Common/zlib/gzguts.h
index d87659d0..f39c3828 100644
--- a/Minecraft.Client/Common/zlib/gzguts.h
+++ b/Minecraft.Client/Common/zlib/gzguts.h
@@ -1,209 +1,216 @@
-/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 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
-#include <fcntl.h>
-
-#ifdef _WIN32
-#  include <stddef.h>
-#endif
-
-#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
-#  include <io.h>
-#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, yet still not supported by
-   Microsoft more than a decade later!), _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 */
-#ifdef _MSC_VER
-#  define snprintf _snprintf
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* 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 */
-    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 */
-        /* 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
+/* gzguts.h -- zlib internal header definitions for gz* operations

+ * Copyright (C) 2004-2026 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

+#  undef _FILE_OFFSET_BITS

+#  undef _TIME_BITS

+#endif

+

+#ifdef HAVE_HIDDEN

+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))

+#else

+#  define ZLIB_INTERNAL

+#endif

+

+#if defined(_WIN32)

+#  ifndef WIN32_LEAN_AND_MEAN

+#    define WIN32_LEAN_AND_MEAN

+#  endif

+#  ifndef _CRT_SECURE_NO_WARNINGS

+#    define _CRT_SECURE_NO_WARNINGS

+#  endif

+#  ifndef _CRT_NONSTDC_NO_DEPRECATE

+#    define _CRT_NONSTDC_NO_DEPRECATE

+#  endif

+#endif

+

+#include <stdio.h>

+#include "zlib.h"

+#ifdef STDC

+#  include <string.h>

+#  include <stdlib.h>

+#  include <limits.h>

+#endif

+

+#ifndef _POSIX_C_SOURCE

+#  define _POSIX_C_SOURCE 200112L

+#endif

+#include <fcntl.h>

+

+#ifdef _WIN32

+#  include <stddef.h>

+#endif

+

+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)

+#  include <io.h>

+#  include <sys/stat.h>

+#endif

+

+#if defined(_WIN32) && !defined(WIDECHAR)

+#  define WIDECHAR

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

+#  if !defined(NO_vsnprintf) && \

+      (defined(MSDOS) || defined(__TURBOC__) || defined(__SASC) || \

+       defined(VMS) || defined(__OS400) || defined(__MVS__))

+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),

+   but for now we just assume it doesn't. */

+#    define NO_vsnprintf

+#  endif

+#  ifdef WIN32

+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */

+#    if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )

+#      ifndef vsnprintf

+#        define vsnprintf _vsnprintf

+#      endif

+#    endif

+#  elif !defined(__STDC_VERSION__) || __STDC_VERSION__-0 < 199901L

+/* Otherwise if C89/90, assume no C99 snprintf() or vsnprintf() */

+#    ifndef NO_snprintf

+#      define NO_snprintf

+#    endif

+#    ifndef NO_vsnprintf

+#      define NO_vsnprintf

+#    endif

+#  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(uInt size);

+  extern void   free(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(const char *, const char *);

+    ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);

+    ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);

+    ZEXTERN z_off64_t ZEXPORT gzoffset64(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 junk;               /* -1 = start, 1 = junk candidate, 0 = in gzip */

+    int how;                /* 0: get header, 1: copy, 2: decompress */

+    int again;              /* true if EAGAIN or EWOULDBLOCK on last i/o */

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

+        /* 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(gz_statep, int, const char *);

+#if defined UNDER_CE

+char ZLIB_INTERNAL *gz_strwinerror(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) */

+unsigned ZLIB_INTERNAL gz_intmax(void);

+#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())

diff --git a/Minecraft.Client/Common/zlib/gzlib.c b/Minecraft.Client/Common/zlib/gzlib.c
index fae202ef..e8260dda 100644
--- a/Minecraft.Client/Common/zlib/gzlib.c
+++ b/Minecraft.Client/Common/zlib/gzlib.c
@@ -1,634 +1,609 @@
-/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011, 2012, 2013 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 */
-    }
-    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;
-    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 _WIN32
-    if (fd == -2) {
-        len = wcstombs(NULL, path, 0);
-        if (len == (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 _WIN32
-    if (fd == -2)
-        if (len)
-            wcstombs(state->path, path, len + 1);
-        else
-            *(state->path) = 0;
-    else
-#endif
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-        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 _WIN32
-        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)
-        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)
-    snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
-#else
-    sprintf(path, "<fd:%d>", fd);   /* for debugging */
-#endif
-    gz = gz_open(path, fd, mode);
-    free(path);
-    return gz;
-}
-
-/* -- see zlib.h -- */
-#ifdef _WIN32
-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 < 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 - 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)
-    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
-    return;
-}
-
-#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
+/* gzlib.c -- zlib functions common to reading and writing gzip files

+ * Copyright (C) 2004-2026 Mark Adler

+ * For conditions of distribution and use, see copyright notice in zlib.h

+ */

+

+#include "gzguts.h"

+

+#if defined(__DJGPP__)

+#  define LSEEK llseek

+#elif defined(_WIN32) && !defined(__BORLANDC__) && !defined(UNDER_CE)

+#  define LSEEK _lseeki64

+#elif defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0

+#  define LSEEK lseek64

+#else

+#  define LSEEK lseek

+#endif

+

+#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(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);       /* assumes buf is big enough */

+        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(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 */

+        state->junk = -1;           /* mark first member */

+    }

+    else                            /* for writing ... */

+        state->reset = 0;           /* no deflateReset pending */

+    state->again = 0;               /* no stalled i/o yet */

+    state->skip = 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(const void *path, int fd, const char *mode) {

+    gz_statep state;

+    z_size_t len;

+    int oflag = 0;

+#ifdef O_EXCL

+    int exclusive = 0;

+#endif

+

+    /* check input */

+    if (path == NULL || mode == 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->err = Z_OK;          /* no error yet */

+    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':

+                oflag |= O_CLOEXEC;

+                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 'G':

+                state->direct = -1;

+                break;

+#ifdef O_NONBLOCK

+            case 'N':

+                oflag |= O_NONBLOCK;

+                break;

+#endif

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

+    }

+

+    /* direct is 0, 1 if "T", or -1 if "G" (last "G" or "T" wins) */

+    if (state->mode == GZ_READ) {

+        if (state->direct == 1) {

+            /* can't force a transparent read */

+            free(state);

+            return NULL;

+        }

+        if (state->direct == 0)

+            /* default when reading is auto-detect of gzip vs. transparent --

+               start with a transparent assumption in case of an empty file */

+            state->direct = 1;

+    }

+    else if (state->direct == -1) {

+        /* "G" has no meaning when writing -- disallow it */

+        free(state);

+        return NULL;

+    }

+    /* if reading, direct == 1 for auto-detect, -1 for gzip only; if writing or

+       appending, direct == 0 for gzip, 1 for transparent (copy in to out) */

+

+    /* save the path name for error messages */

+#ifdef WIDECHAR

+    if (fd == -2)

+        len = wcstombs(NULL, path, 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

+        (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) */

+    if (fd == -1)

+        state->fd = open((const char *)path, oflag, 0666);

+#ifdef WIDECHAR

+    else if (fd == -2)

+        state->fd = _wopen(path, oflag, _S_IREAD | _S_IWRITE);

+#endif

+    else {

+#ifdef O_NONBLOCK

+        if (oflag & O_NONBLOCK)

+            fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);

+#endif

+#ifdef O_CLOEXEC

+        if (oflag & O_CLOEXEC)

+            fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | O_CLOEXEC);

+#endif

+        state->fd = fd;

+    }

+    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(const char *path, const char *mode) {

+    return gz_open(path, -1, mode);

+}

+

+/* -- see zlib.h -- */

+gzFile ZEXPORT gzopen64(const char *path, const char *mode) {

+    return gz_open(path, -1, mode);

+}

+

+/* -- see zlib.h -- */

+gzFile ZEXPORT gzdopen(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(const wchar_t *path, const char *mode) {

+    return gz_open(path, -2, mode);

+}

+#endif

+

+/* -- see zlib.h -- */

+int ZEXPORT gzbuffer(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 < 8)

+        size = 8;               /* needed to behave well with flushing */

+    state->want = size;

+    return 0;

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzrewind(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(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 {

+        offset += state->past ? 0 : state->skip;

+        state->skip = 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->skip = 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) */

+    state->skip = offset;

+    return state->x.pos + offset;

+}

+

+/* -- see zlib.h -- */

+z_off_t ZEXPORT gzseek(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(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->past ? 0 : state->skip);

+}

+

+/* -- see zlib.h -- */

+z_off_t ZEXPORT gztell(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(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(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(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(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(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(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->again)

+        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

+}

+

+/* 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(void) {

+#ifdef INT_MAX

+    return INT_MAX;

+#else

+    unsigned p = 1, q;

+

+    do {

+        q = p;

+        p <<= 1;

+        p++;

+    } while (p > q);

+    return q >> 1;

+#endif

+}

diff --git a/Minecraft.Client/Common/zlib/gzread.c b/Minecraft.Client/Common/zlib/gzread.c
index bf4538eb..420a8065 100644
--- a/Minecraft.Client/Common/zlib/gzread.c
+++ b/Minecraft.Client/Common/zlib/gzread.c
@@ -1,594 +1,668 @@
-/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 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));
-
-/* 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;
-
-    *have = 0;
-    do {
-        ret = read(state->fd, buf + *have, len - *have);
-        if (ret <= 0)
-            break;
-        *have += 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) {
-            if (state->out != NULL)
-                free(state->out);
-            if (state->in != NULL)
-                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;
-    if (strm->avail_in) {
-        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;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    unsigned got, n;
-    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 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 the flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-        return -1;
-    }
-
-    /* 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 -1;
-    }
-
-    /* get len bytes to buf, or less than len if at the end */
-    got = 0;
-    do {
-        /* first just try copying data from the output buffer */
-        if (state->x.have) {
-            n = state->x.have > len ? len : 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 && 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 || len < (state->size << 1)) {
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return -1;
-            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, len, &n) == -1)
-                return -1;
-        }
-
-        /* large len -- decompress directly into user buffer */
-        else {  /* state->how == GZIP */
-            strm->avail_out = len;
-            strm->next_out = (unsigned char *)buf;
-            if (gz_decomp(state) == -1)
-                return -1;
-            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 (will fit in int) */
-    return (int)got;
-}
-
-/* -- see zlib.h -- */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#else
-#  undef gzgetc
-#endif
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    int ret;
-    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 gzread() */
-    ret = gzread(file, buf, 1);
-    return ret < 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] = 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] = 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;
-}
+/* gzread.c -- zlib functions for reading gzip files

+ * Copyright (C) 2004-2026 Mark Adler

+ * For conditions of distribution and use, see copyright notice in zlib.h

+ */

+

+#include "gzguts.h"

+

+/* 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. It

+   also needs to loop to manage the fact that read() returns an int. If the

+   descriptor is non-blocking and read() returns with no data in order to avoid

+   blocking, then gz_load() will return 0 if some data has been read, or -1 if

+   no data has been read. Either way, state->again is set true to indicate a

+   non-blocking event. If errno is non-zero on return, then there was an error

+   signaled from read().  *have is set to the number of bytes read. */

+local int gz_load(gz_statep state, unsigned char *buf, unsigned len,

+                  unsigned *have) {

+    int ret;

+    unsigned get, max = ((unsigned)-1 >> 2) + 1;

+

+    state->again = 0;

+    errno = 0;

+    *have = 0;

+    do {

+        get = len - *have;

+        if (get > max)

+            get = max;

+        ret = (int)read(state->fd, buf + *have, get);

+        if (ret <= 0)

+            break;

+        *have += (unsigned)ret;

+    } while (*have < len);

+    if (ret < 0) {

+        if (errno == EAGAIN || errno == EWOULDBLOCK) {

+            state->again = 1;

+            if (*have != 0)

+                return 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(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;

+

+            if (q != p) {

+                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(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;

+        }

+    }

+

+    /* if transparent reading is disabled, which would only be at the start, or

+       if we're looking for a gzip member after the first one, which is not at

+       the start, then proceed directly to look for a gzip member next */

+    if (state->direct == -1 || state->junk == 0) {

+        inflateReset(strm);

+        state->how = GZIP;

+        state->junk = state->junk != -1;

+        state->direct = 0;

+        return 0;

+    }

+

+    /* otherwise we're at the start with auto-detect -- we check to see if the

+       first four bytes could be gzip header in order to decide whether or not

+       this will be a transparent read */

+

+    /* load any header bytes into the input buffer -- if the input is empty,

+       then it's not an error as this is a transparent read of zero bytes */

+    if (gz_avail(state) == -1)

+        return -1;

+    if (strm->avail_in == 0 || (state->again && strm->avail_in < 4))

+        /* if non-blocking input stalled before getting four bytes, then

+           return and wait until a later call has accumulated enough */

+        return 0;

+

+    /* see if this is (likely) gzip input -- if the first four bytes are

+       consistent with a gzip header, then go look for the first gzip member,

+       otherwise proceed to copy the input transparently */

+    if (strm->avail_in > 3 &&

+            strm->next_in[0] == 31 && strm->next_in[1] == 139 &&

+            strm->next_in[2] == 8 && strm->next_in[3] < 32) {

+        inflateReset(strm);

+        state->how = GZIP;

+        state->junk = 1;

+        state->direct = 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;

+    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. If EOF is reached when looking for more input to

+   complete the gzip member, then an unexpected end of file error is raised.

+   If there is no more input, but state->again is true, then EOF has not been

+   reached, and no error is raised. */

+local int gz_decomp(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) {

+            ret = state->err;

+            break;

+        }

+        if (strm->avail_in == 0) {

+            if (!state->again)

+                gz_error(state, Z_BUF_ERROR, "unexpected end of file");

+            break;

+        }

+

+        /* decompress and handle errors */

+        ret = inflate(strm, Z_NO_FLUSH);

+        if (strm->avail_out < had)

+            /* any decompressed data marks this as a real gzip stream */

+            state->junk = 0;

+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {

+            gz_error(state, Z_STREAM_ERROR,

+                     "internal error: inflate stream corrupt");

+            break;

+        }

+        if (ret == Z_MEM_ERROR) {

+            gz_error(state, Z_MEM_ERROR, "out of memory");

+            break;

+        }

+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */

+            if (state->junk == 1) {             /* trailing garbage is ok */

+                strm->avail_in = 0;

+                state->eof = 1;

+                state->how = LOOK;

+                ret = Z_OK;

+                break;

+            }

+            gz_error(state, Z_DATA_ERROR,

+                     strm->msg == NULL ? "compressed data error" : strm->msg);

+            break;

+        }

+    } 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->junk = 0;

+        state->how = LOOK;

+        return 0;

+    }

+

+    /* return decompression status */

+    return ret != Z_OK ? -1 : 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(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;

+            break;

+        default:

+            gz_error(state, Z_STREAM_ERROR, "state corrupt");

+            return -1;

+        }

+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));

+    return 0;

+}

+

+/* Skip state->skip (> 0) uncompressed bytes of output.  Return -1 on error, 0

+   on success. */

+local int gz_skip(gz_statep state) {

+    unsigned n;

+

+    /* skip over len bytes or reach end-of-file, whichever comes first */

+    do {

+        /* skip over whatever is in output buffer */

+        if (state->x.have) {

+            n = GT_OFF(state->x.have) ||

+                (z_off64_t)state->x.have > state->skip ?

+                (unsigned)state->skip : state->x.have;

+            state->x.have -= n;

+            state->x.next += n;

+            state->x.pos += n;

+            state->skip -= 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;

+        }

+    } while (state->skip);

+    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. If there was an error, but some uncompressed

+   bytes were read before the error, then that count is returned. The error is

+   still recorded, and so is deferred until the next call. */

+local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {

+    z_size_t got;

+    unsigned n;

+    int err;

+

+    /* if len is zero, avoid unnecessary operations */

+    if (len == 0)

+        return 0;

+

+    /* process a skip request */

+    if (state->skip && gz_skip(state) == -1)

+        return 0;

+

+    /* get len bytes to buf, or less than len if at the end */

+    got = 0;

+    err = 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;

+            if (state->err != Z_OK)

+                /* caught deferred error from gz_fetch() */

+                err = -1;

+        }

+

+        /* output buffer empty -- return if we're at the end of the input */

+        else if (state->eof && state->strm.avail_in == 0)

+            break;

+

+        /* need output data -- for small len or new stream load up our output

+           buffer, so that gzgetc() can be fast */

+        else if (state->how == LOOK || n < (state->size << 1)) {

+            /* get more output, looking for header if required */

+            if (gz_fetch(state) == -1 && state->x.have == 0)

+                /* if state->x.have != 0, error will be caught after copy */

+                err = -1;

+            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 */

+            err = gz_load(state, (unsigned char *)buf, n, &n);

+

+        /* large len -- decompress directly into user buffer */

+        else {  /* state->how == GZIP */

+            state->strm.avail_out = n;

+            state->strm.next_out = (unsigned char *)buf;

+            err = gz_decomp(state);

+            n = state->x.have;

+            state->x.have = 0;

+        }

+

+        /* update progress */

+        len -= n;

+        buf = (char *)buf + n;

+        got += n;

+        state->x.pos += n;

+    } while (len && !err);

+

+    /* note read past eof */

+    if (len && state->eof)

+        state->past = 1;

+

+    /* return number of bytes read into user buffer */

+    return got;

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzread(gzFile file, voidp buf, unsigned len) {

+    gz_statep state;

+

+    /* get internal structure and check that it's for reading */

+    if (file == NULL)

+        return -1;

+    state = (gz_statep)file;

+    if (state->mode != GZ_READ)

+        return -1;

+

+    /* check that there was no (serious) error */

+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)

+        return -1;

+    gz_error(state, Z_OK, NULL);

+

+    /* 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) {

+        if (state->err != Z_OK && state->err != Z_BUF_ERROR)

+            return -1;

+        if (state->again) {

+            /* non-blocking input stalled after some input was read, but no

+               uncompressed bytes were produced -- let the application know

+               this isn't EOF */

+            gz_error(state, Z_ERRNO, zstrerror());

+            return -1;

+        }

+    }

+

+    /* return the number of bytes read */

+    return (int)len;

+}

+

+/* -- see zlib.h -- */

+z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,

+                         gzFile file) {

+    z_size_t len;

+    gz_statep state;

+

+    /* get internal structure and check that it's for reading */

+    if (file == NULL)

+        return 0;

+    state = (gz_statep)file;

+    if (state->mode != GZ_READ)

+        return 0;

+

+    /* check that there was no (serious) error */

+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)

+        return 0;

+    gz_error(state, Z_OK, NULL);

+

+    /* 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(gzFile file) {

+    unsigned char buf[1];

+    gz_statep state;

+

+    /* get internal structure and check that it's for reading */

+    if (file == NULL)

+        return -1;

+    state = (gz_statep)file;

+    if (state->mode != GZ_READ)

+        return -1;

+

+    /* check that there was no (serious) error */

+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)

+        return -1;

+    gz_error(state, Z_OK, NULL);

+

+    /* 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_(gzFile file) {

+    return gzgetc(file);

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzungetc(int c, gzFile file) {

+    gz_statep state;

+

+    /* get internal structure and check that it's for reading */

+    if (file == NULL)

+        return -1;

+    state = (gz_statep)file;

+    if (state->mode != GZ_READ)

+        return -1;

+

+    /* in case this was just opened, set up the input buffer */

+    if (state->how == LOOK && state->x.have == 0)

+        (void)gz_look(state);

+

+    /* check that there was no (serious) error */

+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)

+        return -1;

+    gz_error(state, Z_OK, NULL);

+

+    /* process a skip request */

+    if (state->skip && gz_skip(state) == -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(gzFile file, char *buf, int len) {

+    unsigned left, n;

+    char *str;

+    unsigned char *eol;

+    gz_statep state;

+

+    /* check parameters, get internal structure, and check that it's for

+       reading */

+    if (file == NULL || buf == NULL || len < 1)

+        return NULL;

+    state = (gz_statep)file;

+    if (state->mode != GZ_READ)

+        return NULL;

+

+    /* check that there was no (serious) error */

+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)

+        return NULL;

+    gz_error(state, Z_OK, NULL);

+

+    /* process a skip request */

+    if (state->skip && gz_skip(state) == -1)

+        return NULL;

+

+    /* copy output up to a new line, len-1 bytes, or there is no more output,

+       whichever comes first */

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

+            break;                      /* 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);

+

+    /* append a terminating zero to the string (we don't check for a zero in

+       the contents, let the user worry about that) -- return the terminated

+       string, or if nothing was read, NULL */

+    if (buf == str)

+        return NULL;

+    buf[0] = 0;

+    return str;

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzdirect(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 == 1;

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzclose_r(gzFile file) {

+    int ret, err;

+    gz_statep state;

+

+    /* get internal structure and check that it's for reading */

+    if (file == NULL)

+        return Z_STREAM_ERROR;

+    state = (gz_statep)file;

+    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/Minecraft.Client/Common/zlib/gzwrite.c b/Minecraft.Client/Common/zlib/gzwrite.c
index aa767fbf..79b04562 100644
--- a/Minecraft.Client/Common/zlib/gzwrite.c
+++ b/Minecraft.Client/Common/zlib/gzwrite.c
@@ -1,577 +1,700 @@
-/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 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));
-
-/* Initialize state for writing a gzip file.  Mark initialization by setting
-   state->size to non-zero.  Return -1 on failure or 0 on success. */
-local int gz_init(state)
-    gz_statep state;
-{
-    int ret;
-    z_streamp strm = &(state->strm);
-
-    /* allocate input buffer */
-    state->in = (unsigned char *)malloc(state->want);
-    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;
-        }
-    }
-
-    /* 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, 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, got;
-    unsigned have;
-    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) {
-        got = write(state->fd, strm->next_in, strm->avail_in);
-        if (got < 0 || (unsigned)got != strm->avail_in) {
-            gz_error(state, Z_ERRNO, zstrerror());
-            return -1;
-        }
-        strm->avail_in = 0;
-        return 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))) {
-            have = (unsigned)(strm->next_out - state->x.next);
-            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
-                         (unsigned)got != have)) {
-                gz_error(state, Z_ERRNO, zstrerror());
-                return -1;
-            }
-            if (strm->avail_out == 0) {
-                strm->avail_out = state->size;
-                strm->next_out = state->out;
-            }
-            state->x.next = strm->next_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)
-        deflateReset(strm);
-
-    /* all done, no errors */
-    return 0;
-}
-
-/* Compress len zeros to output.  Return -1 on error, 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;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
-    unsigned put = len;
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    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 0;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids the flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-        return 0;
-    }
-
-    /* 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 (strm->avail_in == 0)
-                strm->next_in = state->in;
-            have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-            copy = state->size - have;
-            if (copy > len)
-                copy = len;
-            memcpy(state->in + have, buf, copy);
-            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 (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-            return 0;
-
-        /* directly compress user buffer to file */
-        strm->avail_in = len;
-        strm->next_in = (z_const Bytef *)buf;
-        state->x.pos += len;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return 0;
-    }
-
-    /* input was all buffered or compressed (put will fit in int) */
-    return (int)put;
-}
-
-/* -- 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] = c;
-            strm->avail_in++;
-            state->x.pos++;
-            return c & 0xff;
-        }
-    }
-
-    /* no room in buffer or not initialized, use gz_write() */
-    buf[0] = c;
-    if (gzwrite(file, buf, 1) != 1)
-        return -1;
-    return c & 0xff;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputs(file, str)
-    gzFile file;
-    const char *str;
-{
-    int ret;
-    unsigned len;
-
-    /* write string */
-    len = (unsigned)strlen(str);
-    ret = gzwrite(file, str, len);
-    return ret == 0 && len != 0 ? -1 : ret;
-}
-
-#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 size, len;
-    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 0;
-
-    /* make sure we have some buffer space */
-    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;
-    }
-
-    /* consume whatever's left in the input buffer */
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-        return 0;
-
-    /* do the printf() into the input buffer, put length in len */
-    size = (int)(state->size);
-    state->in[size - 1] = 0;
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-    (void)vsprintf((char *)(state->in), format, va);
-    for (len = 0; len < size; len++)
-        if (state->in[len] == 0) break;
-#  else
-    len = vsprintf((char *)(state->in), format, va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-    (void)vsnprintf((char *)(state->in), size, format, va);
-    len = strlen((char *)(state->in));
-#  else
-    len = vsnprintf((char *)(state->in), size, format, va);
-#  endif
-#endif
-
-    /* check that printf() results fit in buffer */
-    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, defer compression until needed */
-    strm->avail_in = (unsigned)len;
-    strm->next_in = state->in;
-    state->x.pos += len;
-    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;
-{
-    int size, len;
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that can really pass pointer in ints */
-    if (sizeof(int) != sizeof(void *))
-        return 0;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* make sure we have some buffer space */
-    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;
-    }
-
-    /* consume whatever's left in the input buffer */
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-        return 0;
-
-    /* do the printf() into the input buffer, put length in len */
-    size = (int)(state->size);
-    state->in[size - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-    sprintf((char *)(state->in), 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 (state->in[len] == 0) break;
-#  else
-    len = sprintf((char *)(state->in), 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((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen((char *)(state->in));
-#  else
-    len = snprintf((char *)(state->in), 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 >= (int)size || state->in[size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, defer compression until needed */
-    strm->avail_in = (unsigned)len;
-    strm->next_in = state->in;
-    state->x.pos += len;
-    return len;
-}
-
-#endif
-
-/* -- see zlib.h -- */
-int ZEXPORT gzflush(file, flush)
-    gzFile file;
-    int flush;
-{
-    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 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 -1;
-    }
-
-    /* compress remaining data with requested flush */
-    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 -1;
-    }
-
-    /* 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_PARTIAL_FLUSH) == -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;
-}
+/* gzwrite.c -- zlib functions for writing gzip files

+ * Copyright (C) 2004-2026 Mark Adler

+ * For conditions of distribution and use, see copyright notice in zlib.h

+ */

+

+#include "gzguts.h"

+

+/* 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(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(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) {

+            errno = 0;

+            state->again = 0;

+            put = strm->avail_in > max ? max : strm->avail_in;

+            writ = (int)write(state->fd, strm->next_in, put);

+            if (writ < 0) {

+                if (errno == EAGAIN || errno == EWOULDBLOCK)

+                    state->again = 1;

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

+           we're not flushing */

+        if (strm->avail_in == 0 && flush == Z_NO_FLUSH)

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

+                errno = 0;

+                state->again = 0;

+                put = strm->next_out - state->x.next > (int)max ? max :

+                      (unsigned)(strm->next_out - state->x.next);

+                writ = (int)write(state->fd, state->x.next, put);

+                if (writ < 0) {

+                    if (errno == EAGAIN || errno == EWOULDBLOCK)

+                        state->again = 1;

+                    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 state->skip (> 0) zeros to output.  Return -1 on a write error or

+   memory allocation failure by gz_comp(), or 0 on success. state->skip is

+   updated with the number of successfully written zeros, in case there is a

+   stall on a non-blocking write destination. */

+local int gz_zero(gz_statep state) {

+    int first, ret;

+    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 state->skip zeros */

+    first = 1;

+    do {

+        n = GT_OFF(state->size) || (z_off64_t)state->size > state->skip ?

+            (unsigned)state->skip : state->size;

+        if (first) {

+            memset(state->in, 0, n);

+            first = 0;

+        }

+        strm->avail_in = n;

+        strm->next_in = state->in;

+        ret = gz_comp(state, Z_NO_FLUSH);

+        n -= strm->avail_in;

+        state->x.pos += n;

+        state->skip -= n;

+        if (ret == -1)

+            return -1;

+    } while (state->skip);

+    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. If the error

+   was a non-blocking stall, then the number of bytes consumed is returned.

+   For any other error, 0 is returned. */

+local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {

+    z_size_t put = len;

+    int ret;

+

+    /* 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->skip && gz_zero(state) == -1)

+        return 0;

+

+    /* for small len, copy to input buffer, otherwise compress directly */

+    if (len < state->size) {

+        /* copy to input buffer, compress when full */

+        for (;;) {

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

+                break;

+            if (gz_comp(state, Z_NO_FLUSH) == -1)

+                return state->again ? put - len : 0;

+        }

+    }

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

+            ret = gz_comp(state, Z_NO_FLUSH);

+            n -= state->strm.avail_in;

+            state->x.pos += n;

+            len -= n;

+            if (ret == -1)

+                return state->again ? put - len : 0;

+        } while (len);

+    }

+

+    /* input was all buffered or compressed */

+    return put;

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzwrite(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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return 0;

+    gz_error(state, Z_OK, NULL);

+

+    /* 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(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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return 0;

+    gz_error(state, Z_OK, NULL);

+

+    /* 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(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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return -1;

+    gz_error(state, Z_OK, NULL);

+

+    /* check for seek request */

+    if (state->skip && gz_zero(state) == -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(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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return -1;

+    gz_error(state, Z_OK, NULL);

+

+    /* 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 len && put == 0 ? -1 : (int)put;

+}

+

+#if (((!defined(STDC) && !defined(Z_HAVE_STDARG_H)) || !defined(NO_vsnprintf)) && \

+     (defined(STDC) || defined(Z_HAVE_STDARG_H) || !defined(NO_snprintf))) || \

+    defined(ZLIB_INSECURE)

+/* If the second half of the input buffer is occupied, write out the contents.

+   If there is any input remaining due to a non-blocking stall on write, move

+   it to the start of the buffer. Return true if this did not open up the

+   second half of the buffer.  state->err should be checked after this to

+   handle a gz_comp() error. */

+local int gz_vacate(gz_statep state) {

+    z_streamp strm;

+

+    strm = &(state->strm);

+    if (strm->next_in + strm->avail_in <= state->in + state->size)

+        return 0;

+    (void)gz_comp(state, Z_NO_FLUSH);

+    if (strm->avail_in == 0) {

+        strm->next_in = state->in;

+        return 0;

+    }

+    memmove(state->in, strm->next_in, strm->avail_in);

+    strm->next_in = state->in;

+    return strm->avail_in > state->size;

+}

+#endif

+

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

+#if defined(NO_vsnprintf) && !defined(ZLIB_INSECURE)

+#warning "vsnprintf() not available -- gzprintf() stub returns Z_STREAM_ERROR"

+#warning "you can recompile with ZLIB_INSECURE defined to use vsprintf()"

+    /* prevent use of insecure vsprintf(), unless purposefully requested */

+    (void)file, (void)format, (void)va;

+    return Z_STREAM_ERROR;

+#else

+    int len, ret;

+    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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return Z_STREAM_ERROR;

+    gz_error(state, Z_OK, NULL);

+

+    /* make sure we have some buffer space */

+    if (state->size == 0 && gz_init(state) == -1)

+        return state->err;

+

+    /* check for seek request */

+    if (state->skip && gz_zero(state) == -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 should be

+       state->size bytes available after the current contents */

+    ret = gz_vacate(state);

+    if (state->err) {

+        if (ret && state->again) {

+            /* There was a non-blocking stall on write, resulting in the part

+               of the second half of the output buffer being occupied.  Return

+               a Z_BUF_ERROR to let the application know that this gzprintf()

+               needs to be retried. */

+            gz_error(state, Z_BUF_ERROR, "stalled write on gzprintf");

+        }

+        if (!state->again)

+            return state->err;

+    }

+    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 */

+    strm->avail_in += (unsigned)len;

+    state->x.pos += len;

+

+    /* write out buffer if more than half is occupied */

+    ret = gz_vacate(state);

+    if (state->err && !state->again)

+        return state->err;

+    return len;

+#endif

+}

+

+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(gzFile file, const char *format, int a1, int a2, int a3,

+                       int a4, int a5, int a6, int a7, int a8, int a9, int a10,

+                       int a11, int a12, int a13, int a14, int a15, int a16,

+                       int a17, int a18, int a19, int a20) {

+#if defined(NO_snprintf) && !defined(ZLIB_INSECURE)

+#warning "snprintf() not available -- gzprintf() stub returns Z_STREAM_ERROR"

+#warning "you can recompile with ZLIB_INSECURE defined to use sprintf()"

+    /* prevent use of insecure sprintf(), unless purposefully requested */

+    (void)file, (void)format, (void)a1, (void)a2, (void)a3, (void)a4, (void)a5,

+    (void)a6, (void)a7, (void)a8, (void)a9, (void)a10, (void)a11, (void)a12,

+    (void)a13, (void)a14, (void)a15, (void)a16, (void)a17, (void)a18,

+    (void)a19, (void)a20;

+    return Z_STREAM_ERROR;

+#else

+    int ret;

+    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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return Z_STREAM_ERROR;

+    gz_error(state, Z_OK, NULL);

+

+    /* make sure we have some buffer space */

+    if (state->size == 0 && gz_init(state) == -1)

+        return state->err;

+

+    /* check for seek request */

+    if (state->skip && gz_zero(state) == -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 */

+    ret = gz_vacate(state);

+    if (state->err) {

+        if (ret && state->again) {

+            /* There was a non-blocking stall on write, resulting in the part

+               of the second half of the output buffer being occupied.  Return

+               a Z_BUF_ERROR to let the application know that this gzprintf()

+               needs to be retried. */

+            gz_error(state, Z_BUF_ERROR, "stalled write on gzprintf");

+        }

+        if (!state->again)

+            return state->err;

+    }

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

+

+    /* write out buffer if more than half is occupied */

+    ret = gz_vacate(state);

+    if (state->err && !state->again)

+        return state->err;

+    return (int)len;

+#endif

+}

+

+#endif

+

+/* -- see zlib.h -- */

+int ZEXPORT gzflush(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 (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))

+        return Z_STREAM_ERROR;

+    gz_error(state, Z_OK, NULL);

+

+    /* check flush parameter */

+    if (flush < 0 || flush > Z_FINISH)

+        return Z_STREAM_ERROR;

+

+    /* check for seek request */

+    if (state->skip && gz_zero(state) == -1)

+        return state->err;

+

+    /* compress remaining data with requested flush */

+    (void)gz_comp(state, flush);

+    return state->err;

+}

+

+/* -- see zlib.h -- */

+int ZEXPORT gzsetparams(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 compressing and that there's no (serious) error */

+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again) ||

+            state->direct)

+        return Z_STREAM_ERROR;

+    gz_error(state, Z_OK, NULL);

+

+    /* if no change is requested, then do nothing */

+    if (level == state->level && strategy == state->strategy)

+        return Z_OK;

+

+    /* check for seek request */

+    if (state->skip && gz_zero(state) == -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(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->skip && gz_zero(state) == -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/Minecraft.Client/Common/zlib/infback.c b/Minecraft.Client/Common/zlib/infback.c
index f3833c2e..b11925ee 100644
--- a/Minecraft.Client/Common/zlib/infback.c
+++ b/Minecraft.Client/Common/zlib/infback.c
@@ -1,640 +1,579 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2011 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 = windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->wnext = 0;
-    state->whave = 0;
-    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;
-
-        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 -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            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;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    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;
-}
+/* infback.c -- inflate using a call-back interface

+ * Copyright (C) 1995-2026 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"

+

+/*

+   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_(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;

+}

+

+/* 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(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 */

+                inflate_fixed(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;

+            default:

+                strm->msg = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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();

+                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 = (z_const 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 = (z_const 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 = (z_const 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(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/Minecraft.Client/Common/zlib/inffast.c b/Minecraft.Client/Common/zlib/inffast.c
index bda59ceb..89cce1af 100644
--- a/Minecraft.Client/Common/zlib/inffast.c
+++ b/Minecraft.Client/Common/zlib/inffast.c
@@ -1,340 +1,321 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013 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"
-
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
-#else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
-
-/*
-   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 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 - OFF;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
-    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)(PUP(in)) << bits;
-            bits += 8;
-            hold += (unsigned long)(PUP(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));
-            PUP(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)(PUP(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)(PUP(in)) << bits;
-                bits += 8;
-                hold += (unsigned long)(PUP(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)(PUP(in)) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(PUP(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 {
-                                PUP(out) = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            PUP(out) = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--len);
-                            continue;
-                        }
-#endif
-                    }
-                    from = window - OFF;
-                    if (wnext == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(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 {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = window - OFF;
-                            if (wnext < len) {  /* some from start of window */
-                                op = wnext;
-                                len -= op;
-                                do {
-                                    PUP(out) = PUP(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 {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    }
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(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 + OFF;
-    strm->next_out = out + OFF;
-    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 */
+/* inffast.c -- fast decoding

+ * Copyright (C) 1995-2026 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(z_streamp strm, unsigned start) {

+    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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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/Minecraft.Client/Common/zlib/inffast.h b/Minecraft.Client/Common/zlib/inffast.h
index e5c1aa4c..11027c07 100644
--- a/Minecraft.Client/Common/zlib/inffast.h
+++ b/Minecraft.Client/Common/zlib/inffast.h
@@ -1,11 +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));
+/* 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(z_streamp strm, unsigned start);

diff --git a/Minecraft.Client/Common/zlib/inffixed.h b/Minecraft.Client/Common/zlib/inffixed.h
index d6283277..6df0be6f 100644
--- a/Minecraft.Client/Common/zlib/inffixed.h
+++ b/Minecraft.Client/Common/zlib/inffixed.h
@@ -1,94 +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}
-    };
+/* 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/Minecraft.Client/Common/zlib/inflate.c b/Minecraft.Client/Common/zlib/inflate.c
index 870f89bb..f015dd02 100644
--- a/Minecraft.Client/Common/zlib/inflate.c
+++ b/Minecraft.Client/Common/zlib/inflate.c
@@ -1,1512 +1,1413 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 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 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));
-
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) 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->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 (strm == Z_NULL || strm->state == Z_NULL) 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 (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        wrap = (windowBits >> 4) + 1;
-#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->window = Z_NULL;
-    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 (strm == Z_NULL || strm->state == Z_NULL) 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 + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += 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, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(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 (strm == Z_NULL || strm->state == Z_NULL || 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 */
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            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;
-            else if (len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            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) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        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) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        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) CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        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;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if (state->flags & 0x0200)
-                        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;
-        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++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    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;
-        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++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    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;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if (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;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-        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;
-        case COPY_:
-            state->mode = COPY;
-        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;
-        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;
-        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;
-        case LEN_:
-            state->mode = LEN;
-        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;
-        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;
-        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;
-        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;
-        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 (out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((
-#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;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        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:
-        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 && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = 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 (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        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 (strm == Z_NULL || strm->state == Z_NULL) 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 (strm == Z_NULL || strm->state == Z_NULL) 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 (strm == Z_NULL || strm->state == Z_NULL) 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 */
-    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 (strm == Z_NULL || strm->state == Z_NULL) 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;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    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 (strm == Z_NULL || strm->state == Z_NULL) 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 (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-        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));
-    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 (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->sane = !subvert;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    return Z_OK;
-#else
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
-    state = (struct inflate_state FAR *)strm->state;
-    return ((long)(state->back) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
+/* inflate.c -- zlib decompression

+ * Copyright (C) 1995-2026 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"

+

+local int inflateStateCheck(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(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;

+    strm->data_type = 0;

+    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(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(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_(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;

+    zmemzero(state, sizeof(struct inflate_state));

+    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_(z_streamp strm, const char *version,

+                         int stream_size) {

+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);

+}

+

+int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {

+    struct inflate_state FAR *state;

+

+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;

+    if (bits == 0)

+        return Z_OK;

+    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 long)value << state->bits;

+    state->bits += (uInt)bits;

+    return Z_OK;

+}

+

+/*

+   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(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(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 = (z_const char *)"incorrect header check";

+                state->mode = BAD;

+                break;

+            }

+            if (BITS(4) != Z_DEFLATED) {

+                strm->msg = (z_const 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 = (z_const 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 = (z_const char *)"unknown compression method";

+                state->mode = BAD;

+                break;

+            }

+            if (state->flags & 0xe000) {

+                strm->msg = (z_const 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 = (z_const 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 */

+                inflate_fixed(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;

+            default:

+                strm->msg = (z_const 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 = (z_const 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 = (z_const 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 = state->distcode = (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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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 = (z_const 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(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(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(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(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(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(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(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(z_streamp dest, z_streamp source) {

+    struct inflate_state FAR *state;

+    struct inflate_state FAR *copy;

+    unsigned char FAR *window;

+

+    /* 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;

+    zmemzero(copy, sizeof(struct inflate_state));

+    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(dest, source, sizeof(z_stream));

+    zmemcpy(copy, 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)

+        zmemcpy(window, state->window, state->whave);

+    copy->window = window;

+    dest->state = (struct internal_state FAR *)copy;

+    return Z_OK;

+}

+

+int ZEXPORT inflateUndermine(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(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(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(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/Minecraft.Client/Common/zlib/inflate.h b/Minecraft.Client/Common/zlib/inflate.h
index 95f4986d..da7b4605 100644
--- a/Minecraft.Client/Common/zlib/inflate.h
+++ b/Minecraft.Client/Common/zlib/inflate.h
@@ -1,122 +1,126 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 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,       /* 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 10K bytes. */
-struct inflate_state {
-    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 */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
-    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 */
-};
+/* 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 hold */

+        /* 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/Minecraft.Client/Common/zlib/inftrees.c b/Minecraft.Client/Common/zlib/inftrees.c
index 44d89cf2..9eb2c3fb 100644
--- a/Minecraft.Client/Common/zlib/inftrees.c
+++ b/Minecraft.Client/Common/zlib/inftrees.c
@@ -1,306 +1,424 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 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.8 Copyright 1995-2013 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 */
-    int end;                    /* use base and extra for symbol > end */
-    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, 72, 78};
-    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 */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
-    }
-
-    /* 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 ((int)(work[sym]) < end) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
-            here.op = (unsigned char)(extra[work[sym]]);
-            here.val = base[work[sym]];
-        }
-        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;
-}
+/* inftrees.c -- generate Huffman trees for efficient decoding

+ * Copyright (C) 1995-2026 Mark Adler

+ * For conditions of distribution and use, see copyright notice in zlib.h

+ */

+

+#ifdef MAKEFIXED

+#  ifndef BUILDFIXED

+#    define BUILDFIXED

+#  endif

+#endif

+#ifdef BUILDFIXED

+#  define Z_ONCE

+#endif

+

+#include "zutil.h"

+#include "inftrees.h"

+#include "inflate.h"

+

+#ifndef NULL

+#  define NULL 0

+#endif

+

+#define MAXBITS 15

+

+const char inflate_copyright[] =

+   " inflate 1.3.2.1 Copyright 1995-2026 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(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 = NULL;  /* base value table to use */

+    const unsigned short FAR *extra = NULL; /* extra bits table to use */

+    unsigned match = 0;         /* 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, 68, 193};

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

+        match = 20;

+        break;

+    case LENS:

+        base = lbase;

+        extra = lext;

+        match = 257;

+        break;

+    case DISTS:

+        base = dbase;

+        extra = dext;

+    }

+

+    /* 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;

+}

+

+#ifdef BUILDFIXED

+/*

+  If this is compiled with BUILDFIXED defined, and if inflate will be used in

+  multiple threads, and if atomics are not available, then inflate() must be

+  called with a fixed block (e.g. 0x03 0x00) to initialize the tables and must

+  return before any other threads are allowed to call inflate.

+ */

+

+static code *lenfix, *distfix;

+static code fixed[544];

+

+/* State for z_once(). */

+local z_once_t built = Z_ONCE_INIT;

+

+local void buildtables(void) {

+    unsigned sym, bits;

+    static code *next;

+    unsigned short lens[288], work[288];

+

+    /* literal/length table */

+    sym = 0;

+    while (sym < 144) lens[sym++] = 8;

+    while (sym < 256) lens[sym++] = 9;

+    while (sym < 280) lens[sym++] = 7;

+    while (sym < 288) lens[sym++] = 8;

+    next = fixed;

+    lenfix = next;

+    bits = 9;

+    inflate_table(LENS, lens, 288, &(next), &(bits), work);

+

+    /* distance table */

+    sym = 0;

+    while (sym < 32) lens[sym++] = 5;

+    distfix = next;

+    bits = 5;

+    inflate_table(DISTS, lens, 32, &(next), &(bits), work);

+}

+#else /* !BUILDFIXED */

+#  include "inffixed.h"

+#endif /* BUILDFIXED */

+

+/*

+   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 if atomics are not available, as it will

+   not be thread-safe.

+ */

+void inflate_fixed(struct inflate_state FAR *state) {

+#ifdef BUILDFIXED

+    z_once(&built, buildtables);

+#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 will be #include'd above.  Defining MAKEFIXED

+   also defines BUILDFIXED, so the tables are built on the fly.  main() writes

+   those tables to stdout, which would directed to inffixed.h. Compile this

+   along with zutil.c:

+

+       cc -DMAKEFIXED -o fix inftrees.c zutil.c

+       ./fix > inffixed.h

+ */

+int main(void) {

+    unsigned low, size;

+    struct inflate_state state;

+

+    inflate_fixed(&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("\nstatic 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};");

+    return 0;

+}

+#endif /* MAKEFIXED */

diff --git a/Minecraft.Client/Common/zlib/inftrees.h b/Minecraft.Client/Common/zlib/inftrees.h
index baa53a0b..9b221236 100644
--- a/Minecraft.Client/Common/zlib/inftrees.h
+++ b/Minecraft.Client/Common/zlib/inftrees.h
@@ -1,62 +1,64 @@
-/* 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 distribtution.  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));
+/* inftrees.h -- header to use inftrees.c

+ * Copyright (C) 1995-2026 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 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(codetype type, unsigned short FAR *lens,

+                                unsigned codes, code FAR * FAR *table,

+                                unsigned FAR *bits, unsigned short FAR *work);

+struct inflate_state;

+void ZLIB_INTERNAL inflate_fixed(struct inflate_state FAR *state);

diff --git a/Minecraft.Client/Common/zlib/trees.c b/Minecraft.Client/Common/zlib/trees.c
index 1fd7759e..8e4da01e 100644
--- a/Minecraft.Client/Common/zlib/trees.c
+++ b/Minecraft.Client/Common/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2026 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
  */
@@ -36,7 +36,7 @@
 
 #include "deflate.h"
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #endif
 
@@ -112,7 +112,7 @@ local int base_dist[D_CODES];
 
 #else
 #  include "trees.h"
-#endif /* GEN_TREES_H */
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
 
 struct static_tree_desc_s {
     const ct_data *static_tree;  /* static tree or NULL */
@@ -122,80 +122,141 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local static_tree_desc  static_l_desc =
+#ifdef NO_INIT_GLOBAL_POINTERS
+#  define TCONST
+#else
+#  define TCONST const
+#endif
+
+local TCONST static_tree_desc static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local static_tree_desc  static_d_desc =
+local TCONST static_tree_desc static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local static_tree_desc  static_bl_desc =
+local TCONST static_tree_desc static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
- * Local (static) routines in this file.
+ * 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)); \
+}
+
+/* ===========================================================================
+ * 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(unsigned code, int len) {
+    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(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(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_used = ((s->bi_valid - 1) & 7) + 1;
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef ZLIB_DEBUG
+    s->bits_sent = (s->bits_sent + 7) & ~(ulg)7;
+#endif
+}
+
+/* ===========================================================================
+ * 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(ct_data *tree, int max_code, ushf *bl_count) {
+    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 */
 
-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 value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
+    /* 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));
+    }
+}
 
 #ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
+local void gen_trees_header(void);
 #endif
 
-#ifndef DEBUG
+#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 /* DEBUG */
+#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 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 */
-{
+#ifdef ZLIB_DEBUG
+local void send_bits(deflate_state *s, int value, int length) {
     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))
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
@@ -208,12 +269,12 @@ local void send_bits(s, value, length)
         s->bi_valid += length;
     }
 }
-#else /* !DEBUG */
+#else /* !ZLIB_DEBUG */
 
 #define send_bits(s, value, length) \
 { int len = length;\
   if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
+    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);\
@@ -223,7 +284,7 @@ local void send_bits(s, value, length)
     s->bi_valid += len;\
   }\
 }
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
 
 
 /* the arguments must not have side effects */
@@ -231,8 +292,7 @@ local void send_bits(s, value, length)
 /* ===========================================================================
  * Initialize the various 'constant' tables.
  */
-local void tr_static_init()
-{
+local void tr_static_init(void) {
 #if defined(GEN_TREES_H) || !defined(STDC)
     static int static_init_done = 0;
     int n;        /* iterates over tree elements */
@@ -258,7 +318,7 @@ local void tr_static_init()
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
@@ -267,13 +327,13 @@ local void tr_static_init()
      * 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;
+    _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++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
@@ -281,11 +341,11 @@ local void tr_static_init()
     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++) {
+        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");
+    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;
@@ -314,19 +374,18 @@ local void tr_static_init()
 }
 
 /* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
-#  ifndef DEBUG
+#  ifndef ZLIB_DEBUG
 #    include <stdio.h>
 #  endif
 
 #  define SEPARATOR(i, last, width) \
       ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
 
-void gen_trees_header()
-{
+void gen_trees_header(void) {
     FILE *header = fopen("trees.h", "w");
     int i;
 
@@ -376,11 +435,25 @@ void gen_trees_header()
 #endif /* GEN_TREES_H */
 
 /* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(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;
+}
+
+/* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_init(deflate_state *s) {
     tr_static_init();
 
     s->l_desc.dyn_tree = s->dyn_ltree;
@@ -394,7 +467,8 @@ void ZLIB_INTERNAL _tr_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+    s->bi_used = 0;
+#ifdef ZLIB_DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
 #endif
@@ -403,24 +477,6 @@ void ZLIB_INTERNAL _tr_init(s)
     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->last_lit = s->matches = 0;
-}
-
 #define SMALLEST 1
 /* Index within the heap array of least frequent node in the Huffman tree */
 
@@ -450,17 +506,13 @@ local void init_block(s)
  * 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 */
-{
+local void pqdownheap(deflate_state *s, ct_data *tree, int k) {
     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)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -485,10 +537,7 @@ local void pqdownheap(s, tree, k)
  *     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 */
-{
+local void gen_bitlen(deflate_state *s, tree_desc *desc) {
     ct_data *tree        = desc->dyn_tree;
     int max_code         = desc->max_code;
     const ct_data *stree = desc->stat_desc->static_tree;
@@ -509,7 +558,7 @@ local void gen_bitlen(s, desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    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++;
@@ -520,22 +569,22 @@ local void gen_bitlen(s, desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
+        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
     }
     if (overflow == 0) return;
 
-    Trace((stderr,"\nbit length overflow\n"));
+    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;
+        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[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]
@@ -554,9 +603,8 @@ local void gen_bitlen(s, desc)
             m = s->heap[--h];
             if (m > max_code) continue;
             if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
+                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--;
@@ -564,47 +612,9 @@ local void gen_bitlen(s, desc)
     }
 }
 
-/* ===========================================================================
- * 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 */
-    ush 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++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* 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 = 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));
-    }
-}
+#ifdef DUMP_BL_TREE
+#  include <stdio.h>
+#endif
 
 /* ===========================================================================
  * Construct one Huffman tree and assigns the code bit strings and lengths.
@@ -614,10 +624,7 @@ local void gen_codes (tree, max_code, bl_count)
  *     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 */
-{
+local void build_tree(deflate_state *s, tree_desc *desc) {
     ct_data *tree         = desc->dyn_tree;
     const ct_data *stree  = desc->stat_desc->static_tree;
     int elems             = desc->stat_desc->elems;
@@ -626,7 +633,7 @@ local void build_tree(s, desc)
     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[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;
@@ -654,7 +661,7 @@ local void build_tree(s, desc)
     }
     desc->max_code = max_code;
 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+    /* 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);
@@ -702,11 +709,7 @@ local void build_tree(s, desc)
  * 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 */
-{
+local void scan_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -716,14 +719,14 @@ local void scan_tree (s, tree, max_code)
     int min_count = 4;         /* min repeat count */
 
     if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        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;
+            s->bl_tree[curlen].Freq += (ush)count;
         } else if (curlen != 0) {
             if (curlen != prevlen) s->bl_tree[curlen].Freq++;
             s->bl_tree[REP_3_6].Freq++;
@@ -747,11 +750,7 @@ local void scan_tree (s, tree, max_code)
  * 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 */
-{
+local void send_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -760,11 +759,11 @@ local void send_tree (s, tree, max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    /* 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;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -775,13 +774,13 @@ local void send_tree (s, tree, max_code)
                 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);
+            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);
+            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);
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
@@ -798,9 +797,7 @@ local void send_tree (s, tree, max_code)
  * 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;
-{
+local int build_bl_tree(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 */
@@ -809,8 +806,8 @@ local int build_bl_tree(s)
 
     /* 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.
+    /* 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
@@ -821,8 +818,8 @@ local int build_bl_tree(s)
         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*(max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
+    Tracev((stderr, "\ndyn trees: dyn %lu, stat %lu",
             s->opt_len, s->static_len));
 
     return max_blindex;
@@ -833,55 +830,54 @@ local int build_bl_tree(s)
  * 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 */
-{
+local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
+                          int blcodes) {
     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 */
+    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));
+    Tracev((stderr, "\nbl tree: sent %lu", 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_ltree, lcodes - 1);  /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %lu", 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_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %lu", 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 */
-#ifdef DEBUG
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last) {
+    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
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
 /* ===========================================================================
  * 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;
-{
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s) {
     bi_flush(s);
 }
 
@@ -889,27 +885,117 @@ void ZLIB_INTERNAL _tr_flush_bits(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;
-{
+void ZLIB_INTERNAL _tr_align(deflate_state *s) {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
 }
 
 /* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(deflate_state *s, const ct_data *ltree,
+                          const ct_data *dtree) {
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned sx = 0;    /* running index in symbol buffers */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->sym_next != 0) do {
+#ifdef LIT_MEM
+        dist = s->d_buf[sx];
+        lc = s->l_buf[sx++];
+#else
+        dist = s->sym_buf[sx++] & 0xff;
+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
+        lc = s->sym_buf[sx++];
+#endif
+        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, (int)dist, extra); /* send the extra bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check for no overlay of pending_buf on needed symbols */
+#ifdef LIT_MEM
+        Assert(s->pending < 2 * (s->lit_bufsize + sx), "pendingBuf overflow");
+#else
+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+#endif
+
+    } 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(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;
+}
+
+/* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
+ * 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 */
-{
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last) {
     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 */
 
@@ -922,11 +1008,11 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 
         /* 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,
+        Tracev((stderr, "\nlit data: dyn %lu, stat %lu", 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,
+        Tracev((stderr, "\ndist data: dyn %lu, stat %lu", 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.
@@ -938,14 +1024,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         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;
+        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->last_lit));
+                s->sym_next / 3));
 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
 
     } else {
         Assert(buf != (char*)0, "lost buf");
@@ -955,7 +1044,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #ifdef FORCE_STORED
     if (buf != (char*)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    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.
@@ -966,24 +1055,20 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
          */
         _tr_stored_block(s, buf, stored_len, last);
 
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+    } 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 DEBUG
+#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);
+        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 DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
     }
@@ -995,25 +1080,27 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 
     if (last) {
         bi_windup(s);
-#ifdef DEBUG
+#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));
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*(ulg)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 (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
+#ifdef LIT_MEM
+    s->d_buf[s->sym_next] = (ush)dist;
+    s->l_buf[s->sym_next++] = (uch)lc;
+#else
+    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;
+#endif
     if (dist == 0) {
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;
@@ -1025,202 +1112,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
                (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_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * 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 lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        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 the 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 -= 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 d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    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
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white 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;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-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 "black-listed" or "white-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 DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
+    return (s->sym_next == s->sym_end);
 }
diff --git a/Minecraft.Client/Common/zlib/trees.h b/Minecraft.Client/Common/zlib/trees.h
index d35639d8..ce8f6204 100644
--- a/Minecraft.Client/Common/zlib/trees.h
+++ b/Minecraft.Client/Common/zlib/trees.h
@@ -1,128 +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
-};
-
+/* 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/Minecraft.Client/Common/zlib/uncompr.c b/Minecraft.Client/Common/zlib/uncompr.c
index 242e9493..440879d6 100644
--- a/Minecraft.Client/Common/zlib/uncompr.c
+++ b/Minecraft.Client/Common/zlib/uncompr.c
@@ -1,59 +1,101 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
- * 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 actual size of the compressed buffer.
-
-     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.
-*/
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-            return Z_DATA_ERROR;
-        return err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
+/* uncompr.c -- decompress a memory buffer

+ * Copyright (C) 1995-2026 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.

+

+     The _z versions of the functions take size_t length arguments.

+*/

+int ZEXPORT uncompress2_z(Bytef *dest, z_size_t *destLen, const Bytef *source,

+                          z_size_t *sourceLen) {

+    z_stream stream;

+    int err;

+    const uInt max = (uInt)-1;

+    z_size_t len, left;

+

+    if (sourceLen == NULL || (*sourceLen > 0 && source == NULL) ||

+        destLen == NULL || (*destLen > 0 && dest == NULL))

+        return Z_STREAM_ERROR;

+

+    len = *sourceLen;

+    left = *destLen;

+    if (left == 0 && dest == Z_NULL)

+        dest = (Bytef *)&stream.reserved;       /* next_out cannot be NULL */

+

+    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 > (z_size_t)max ? max : (uInt)left;

+            left -= stream.avail_out;

+        }

+        if (stream.avail_in == 0) {

+            stream.avail_in = len > (z_size_t)max ? max : (uInt)len;

+            len -= stream.avail_in;

+        }

+        err = inflate(&stream, Z_NO_FLUSH);

+    } while (err == Z_OK);

+

+    /* Set len and left to the unused input data and unused output space. Set

+       *sourceLen to the amount of input consumed. Set *destLen to the amount

+       of data produced. */

+    len += stream.avail_in;

+    left += stream.avail_out;

+    *sourceLen -= len;

+    *destLen -= left;

+

+    inflateEnd(&stream);

+    return err == Z_STREAM_END ? Z_OK :

+           err == Z_NEED_DICT ? Z_DATA_ERROR  :

+           err == Z_BUF_ERROR && len == 0 ? Z_DATA_ERROR :

+           err;

+}

+int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,

+                        uLong *sourceLen) {

+    int ret;

+    z_size_t got = *destLen, used = *sourceLen;

+    ret = uncompress2_z(dest, &got, source, &used);

+    *sourceLen = (uLong)used;

+    *destLen = (uLong)got;

+    return ret;

+}

+int ZEXPORT uncompress_z(Bytef *dest, z_size_t *destLen, const Bytef *source,

+                         z_size_t sourceLen) {

+    z_size_t used = sourceLen;

+    return uncompress2_z(dest, destLen, source, &used);

+}

+int ZEXPORT uncompress(Bytef *dest, uLongf *destLen, const Bytef *source,

+                       uLong sourceLen) {

+    uLong used = sourceLen;

+    return uncompress2(dest, destLen, source, &used);

+}

diff --git a/Minecraft.Client/Common/zlib/zconf.h b/Minecraft.Client/Common/zlib/zconf.h
index 9987a775..5c1317f3 100644
--- a/Minecraft.Client/Common/zlib/zconf.h
+++ b/Minecraft.Client/Common/zlib/zconf.h
@@ -1,511 +1,551 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * 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 */
-#  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
-#  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 deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  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 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 gzvprintf             z_gzvprintf
-#    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 gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  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 inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  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
-#  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
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#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 a few 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
-#    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
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    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 */
+/* zconf.h -- configuration of the zlib compression library

+ * Copyright (C) 1995-2026 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 compress_z            z_compress_z

+#    define compress2_z           z_compress2_z

+#    define compressBound         z_compressBound

+#    define compressBound_z       z_compressBound_z

+#  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 deflateBound_z        z_deflateBound_z

+#  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 deflateUsed           z_deflateUsed

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

+#  define inflate_fixed         z_inflate_fixed

+#  ifndef Z_SOLO

+#    define uncompress            z_uncompress

+#    define uncompress2           z_uncompress2

+#    define uncompress_z          z_uncompress_z

+#    define uncompress2_z         z_uncompress2_z

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

+

+#ifndef z_const

+#  ifdef ZLIB_CONST

+#    define z_const const

+#  else

+#    define z_const

+#  endif

+#endif

+

+#ifdef Z_SOLO

+#  ifdef _WIN64

+     typedef unsigned long long z_size_t;

+#  else

+     typedef unsigned long z_size_t;

+#  endif

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

+

+/* 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

+

+#if HAVE_UNISTD_H-0     /* may be set to #if 1 by ./configure */

+#  define Z_HAVE_UNISTD_H

+#endif

+

+#if HAVE_STDARG_H-0     /* 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

+#  if defined(__WATCOMC__) || defined(__GO32__) || \

+      (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 long

+#endif

+

+#if !defined(_WIN32) && defined(Z_LARGE64)

+#  define z_off64_t off64_t

+#elif defined(__MINGW32__)

+#  define z_off64_t long long

+#elif defined(_WIN32) && !defined(__GNUC__)

+#  define z_off64_t __int64

+#elif defined(__GO32__)

+#  define z_off64_t offset_t

+#else

+#  define z_off64_t z_off_t

+#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/Minecraft.Client/Common/zlib/zlib.h b/Minecraft.Client/Common/zlib/zlib.h
index 3e0c7672..0a9e7909 100644
--- a/Minecraft.Client/Common/zlib/zlib.h
+++ b/Minecraft.Client/Common/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.3.2.1, February xxth, 2026
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2026 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
@@ -24,25 +24,29 @@
 
 
   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
+  Comments) 1950 to 1952 at https://datatracker.ietf.org/doc/html/rfc1950
   (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
 #ifndef ZLIB_H
 #define ZLIB_H
 
-#include "zconf.h"
+#ifdef ZLIB_BUILD
+#  include <zconf.h>
+#else
+# include "zconf.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.3.2.1-motley"
+#define ZLIB_VERNUM 0x1321
 #define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VER_MINOR 3
+#define ZLIB_VER_REVISION 2
+#define ZLIB_VER_SUBREVISION 1
 
 /*
     The 'zlib' compression library provides in-memory compression and
@@ -65,7 +69,8 @@ extern "C" {
   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 streams in memory as well.
+    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-
@@ -74,11 +79,11 @@ extern "C" {
 
     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 case of corrupted input.
+  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));
+typedef voidpf (*alloc_func)(voidpf opaque, uInt items, uInt size);
+typedef void   (*free_func)(voidpf opaque, voidpf address);
 
 struct internal_state;
 
@@ -87,7 +92,7 @@ typedef struct z_stream_s {
     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 should be put there */
+    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 */
 
@@ -98,8 +103,9 @@ typedef struct z_stream_s {
     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 */
-    uLong   adler;      /* adler32 value of the uncompressed data */
+    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;
 
@@ -142,7 +148,9 @@ typedef gz_header FAR *gz_headerp;
 
      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.
+   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
@@ -155,7 +163,7 @@ typedef gz_header FAR *gz_headerp;
 
      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 in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -200,7 +208,7 @@ typedef gz_header FAR *gz_headerp;
 #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 (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -213,7 +221,7 @@ typedef gz_header FAR *gz_headerp;
 
                         /* basic functions */
 
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+ZEXTERN const char * ZEXPORT zlibVersion(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
@@ -221,12 +229,12 @@ ZEXTERN const char * ZEXPORT zlibVersion OF((void));
  */
 
 /*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+ZEXTERN int ZEXPORT deflateInit(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.
+   allocation functions.  total_in, total_out, adler, and msg are initialized.
 
      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
@@ -243,7 +251,7 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 */
 
 
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT deflate(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
@@ -258,11 +266,11 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
     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().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - 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 (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    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
@@ -271,7 +279,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   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.
+  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
@@ -292,8 +302,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   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 code
-  block.
+  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
@@ -314,43 +324,47 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   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.
+  avail_out is greater than six when the flush marker begins, in order to avoid
+  repeated flush markers upon calling deflate() again when avail_out == 0.
 
     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, 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 immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, 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 adler32 checksum of all input read
-  so far (that is, total_in bytes).
+  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).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  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), 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.
+  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));
+ZEXTERN int ZEXPORT deflateEnd(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
@@ -365,31 +379,30 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 
 
 /*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateInit(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.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
+   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.  total_in, total_out, adler, and
+   msg are initialized.
 
      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
-   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 inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   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));
+ZEXTERN int ZEXPORT inflate(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
@@ -401,17 +414,20 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 
   - 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), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    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().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - 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.  The
+  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
@@ -428,8 +444,8 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   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.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  To assist in this, on return inflate() always sets strm->data_type to the
+  number of unused bits in the input 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
@@ -454,7 +470,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   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
+  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
@@ -476,44 +492,44 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   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 adler32
+  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, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  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
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  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), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is 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
+  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 desired.
+  recovery of the data is to be attempted.
 */
 
 
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateEnd(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, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
 */
 
 
@@ -524,16 +540,15 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 */
 
 /*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
+ZEXTERN int ZEXPORT deflateInit2(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 next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
+   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.
@@ -544,16 +559,29 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    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 an adler32 check value.
+   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 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   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
@@ -563,18 +591,21 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
 
      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.
+   filter (or predictor), Z_RLE to limit match distances to one (run-length
+   encoding), or Z_HUFFMAN_ONLY to force Huffman encoding only (no string
+   matching).  Filtered data consists mostly of small values with a somewhat
+   random distribution, as produced by the PNG filters.  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 than the
+   default; it is intermediate between Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.
+   Z_RLE is almost as fast as Z_HUFFMAN_ONLY, but should give better
+   compression for PNG image data than Huffman only.  The degree of string
+   matching from most to none is: Z_DEFAULT_STRATEGY, Z_FILTERED, Z_RLE, then
+   Z_HUFFMAN_ONLY. The strategy parameter affects the compression ratio but
+   never the correctness of the compressed output, even if it is not set
+   optimally for the given data.  Z_FIXED uses the default string matching, but
+   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
@@ -584,9 +615,9 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT deflateSetDictionary(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
@@ -614,12 +645,12 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    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 adler32 value
+     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 adler32 value
+   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
-   adler32 value is not computed and strm->adler is not set.
+   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
@@ -628,8 +659,30 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT deflateGetDictionary(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(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -646,43 +699,60 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateReset(z_streamp strm);
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+     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.  total_in, total_out, adler, and msg are initialized.
 
      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));
+ZEXTERN int ZEXPORT deflateParams(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
+   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 level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
+   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 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(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
@@ -695,8 +765,8 @@ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
    returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
  */
 
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
+ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen);
+ZEXTERN z_size_t ZEXPORT deflateBound_z(z_streamp strm, z_size_t sourceLen);
 /*
      deflateBound() returns an upper bound on the compressed size after
    deflation of sourceLen bytes.  It must be called after deflateInit() or
@@ -708,11 +778,14 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    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.
+
+     delfateBound_z() is the same, but takes and returns a size_t length.  Note
+   that a long is 32 bits on Windows.
 */
 
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
+ZEXTERN int ZEXPORT deflatePending(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
@@ -722,12 +795,27 @@ ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
    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.  If an int is 16 bits and memLevel is 9, then
+   it is possible for the number of pending bytes to not fit in an unsigned. In
+   that case Z_BUF_ERROR is returned and *pending is set to the maximum value
+   of an unsigned.
+ */
+
+ZEXTERN int ZEXPORT deflateUsed(z_streamp strm,
+                                int *bits);
+/*
+     deflateUsed() returns in *bits the most recent number of deflate bits used
+   in the last byte when flushing to a byte boundary. The result is in 1..8, or
+   0 if there has not yet been a flush. This helps determine the location of
+   the last bit of a deflate stream.
+
+     deflateUsed 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));
+ZEXTERN int ZEXPORT deflatePrime(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
@@ -742,8 +830,8 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT deflateSetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
@@ -759,16 +847,17 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
    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().
+   the time set to zero, and os set to the current operating system, 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));
+ZEXTERN int ZEXPORT inflateInit2(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
@@ -793,7 +882,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    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 adler32 or a crc32 be applied to
+   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.
@@ -802,7 +891,12 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    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
-   crc32 instead of an adler32.
+   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
@@ -816,14 +910,14 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    deferred until inflate() is called.
 */
 
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT inflateSetDictionary(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 adler32 value returned by that call of inflate.
+   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
@@ -834,27 +928,27 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
      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 adler32 value).  inflateSetDictionary does not
+   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));
+ZEXTERN int ZEXPORT inflateGetDictionary(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.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   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));
+ZEXTERN int ZEXPORT inflateSync(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
@@ -867,14 +961,14 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
      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.
+   In the success case, the application may save the 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));
+ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -889,39 +983,44 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateReset(z_streamp strm);
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
+   total_in, total_out, adler, and msg are initialized.
 
      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));
+ZEXTERN int ZEXPORT inflateReset2(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.
+   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));
+ZEXTERN int ZEXPORT inflatePrime(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.
+     This function inserts bits in the inflate input stream.  The intent is to
+   use inflatePrime() 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 be used with raw inflate, before the first
+   inflate() call, after inflateInit2() or inflateReset().  It can also be used
+   after an inflate() return indicates the end of a deflate block or header
+   when using Z_BLOCK.  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.  The
+   other bits in value can be non-zero, and will be ignored.
 
      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
@@ -929,10 +1028,18 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
    to feeding inflate codes.
 
      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
+   stream state was inconsistent, or if bits is out of range.  If inflate was
+   in the middle of processing a header, trailer, or stored block lengths, then
+   it is possible for there to be only eight bits available in the bit buffer.
+   In that case, bits > 8 is considered out of range.  However, when used as
+   outlined above, there will always be 16 bits available in the buffer for
+   insertion.  As noted in its documentation above, inflate records the number
+   of bits in the bit buffer on return in data_type. 32 minus that is the
+   number of bits available for insertion.  inflatePrime does not update
+   data_type with the new number of bits in buffer.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+ZEXTERN long ZEXPORT inflateMark(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
@@ -956,12 +1063,12 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
    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 -1 << 16 if the provided
+     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));
+ZEXTERN int ZEXPORT inflateGetHeader(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
@@ -975,20 +1082,22 @@ ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
 
      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.
+   was valid if done is set to one.)  The extra, name, and comment pointers
+   much each be either Z_NULL or point to space to store that information from
+   the header.  If extra is not Z_NULL, then extra_max contains the maximum
+   number of bytes that can be written 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, including the terminating zero, are
+   written there.  If comment is not Z_NULL, then up to comm_max characters,
+   including the terminating zero, are written there.  The application can tell
+   that the name or comment did not fit in the provided space by the absence of
+   a terminating zero.  If any of extra, name, or comment are not present in
+   the header, then that field's pointer is set to Z_NULL.  This allows the use
+   of deflateSetHeader() with the returned structure to duplicate the header.
+   Note that if those fields initially pointed to allocated memory, then the
+   application will need to save them 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
@@ -1001,8 +1110,8 @@ ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
 */
 
 /*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
+ZEXTERN int ZEXPORT inflateBackInit(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
@@ -1022,13 +1131,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
    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));
+typedef unsigned (*in_func)(void FAR *,
+                            z_const unsigned char FAR * FAR *);
+typedef int (*out_func)(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));
+ZEXTERN int ZEXPORT inflateBack(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
@@ -1048,9 +1157,9 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    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 normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
+   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
@@ -1059,12 +1168,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    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
+   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().
@@ -1092,11 +1201,11 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    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()
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
    cannot return Z_OK.
 */
 
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateBackEnd(z_streamp strm);
 /*
      All memory allocated by inflateBackInit() is freed.
 
@@ -1104,7 +1213,7 @@ ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
    state was inconsistent.
 */
 
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+ZEXTERN uLong ZEXPORT zlibCompileFlags(void);
 /* Return flags indicating compile-time options.
 
     Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
@@ -1114,7 +1223,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1136,13 +1245,14 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      21: FASTEST -- deflate algorithm with only one, lowest compression level
      22,23: 0 (reserved)
 
-    The sprintf variant used by gzprintf (zero is best):
+    The sprintf variant used by gzprintf (all zeros 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!
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() is not secure!
      26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+     27: 0 = gzprintf() present, 1 = not -- 1 means gzprintf() returns an error
 
     Remainder:
-     27-31: 0 (reserved)
+     28-31: 0 (reserved)
  */
 
 #ifndef Z_SOLO
@@ -1154,56 +1264,66 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
    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.
+   you need special options.  The _z versions of the functions use the size_t
+   type for lengths.  Note that a long is 32 bits on Windows.
 */
 
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT compress(Bytef *dest, uLongf *destLen,
+                             const Bytef *source, uLong sourceLen);
+ZEXTERN int ZEXPORT compress_z(Bytef *dest, z_size_t *destLen,
+                               const Bytef *source, z_size_t 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 buffer.
+   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));
+ZEXTERN int ZEXPORT compress2(Bytef *dest, uLongf *destLen,
+                              const Bytef *source, uLong sourceLen,
+                              int level);
+ZEXTERN int ZEXPORT compress2_z(Bytef *dest, z_size_t *destLen,
+                                const Bytef *source, z_size_t 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 buffer.
+   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));
+ZEXTERN uLong ZEXPORT compressBound(uLong sourceLen);
+ZEXTERN z_size_t ZEXPORT compressBound_z(z_size_t 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));
+ZEXTERN int ZEXPORT uncompress(Bytef *dest, uLongf *destLen,
+                               const Bytef *source, uLong sourceLen);
+ZEXTERN int ZEXPORT uncompress_z(Bytef *dest, z_size_t *destLen,
+                                 const Bytef *source, z_size_t 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
+   the byte length of the source buffer.  On 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 buffer.
+   mechanism outside the scope of this compression library.)  On 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
@@ -1212,6 +1332,16 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen,
+                                const Bytef *source, uLong *sourceLen);
+ZEXTERN int ZEXPORT uncompress2_z(Bytef *dest, z_size_t *destLen,
+                                  const Bytef *source, z_size_t *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 */
 
 /*
@@ -1224,22 +1354,26 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
 typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
 /*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+ZEXTERN gzFile ZEXPORT gzopen(const char *path, const char *mode);
 
-     Opens a gzip (.gz) file for reading or 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.
+     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. 'T' cannot be
+   used to force transparent reading. Transparent reading is automatically
+   performed if there is no gzip header at the start. Transparent reading can
+   be disabled with the 'G' option, which will instead return an error if there
+   is no gzip header. 'N' will open the file in non-blocking mode.
 
-     "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
+     '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
+   '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
@@ -1258,14 +1392,22 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    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.
+   file could not be opened. Note that if 'N' is in mode for non-blocking, the
+   open() itself can fail in order to not block. In that case gzopen() will
+   return NULL and errno will be EAGAIN or ENONBLOCK. The call to gzopen() can
+   then be re-tried. If the application would like to block on opening the
+   file, then it can use open() without O_NONBLOCK, and then gzdopen() with the
+   resulting file descriptor and 'N' in the mode, which will set it to non-
+   blocking.
 */
 
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+ZEXTERN gzFile ZEXPORT gzdopen(int fd, const char *mode);
 /*
-     gzdopen associates 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.
+     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. An
+   'e' in mode will set fd's flag to close the file on an execve() call. An 'N'
+   in mode will set fd's non-blocking flag.
 
      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
@@ -1284,16 +1426,15 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    will not detect if fd is invalid (unless fd is -1).
 */
 
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+ZEXTERN int ZEXPORT gzbuffer(gzFile file, unsigned size);
 /*
-     Set the internal buffer size used by this library's functions.  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.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
+     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().
 
@@ -1301,18 +1442,20 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
    too late.
 */
 
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+ZEXTERN int ZEXPORT gzsetparams(gzFile file, int level, int strategy);
 /*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+     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, or Z_STREAM_ERROR if the file was not
-   opened for writing.
+     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));
+ZEXTERN int ZEXPORT gzread(gzFile file, voidp buf, unsigned len);
 /*
-     Reads the given number of uncompressed bytes from the compressed file.  If
+     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.
 
@@ -1334,109 +1477,202 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
    stream.  Alternatively, gzerror can be used before gzclose to detect this
    case.
 
+     gzread can be used to read a gzip file on a non-blocking device. If the
+   input stalls and there is no uncompressed data to return, then gzread() will
+   return -1, and errno will be EAGAIN or EWOULDBLOCK. gzread() can then be
+   called again.
+
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   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. If some data was read before an error, then that data is
+   returned until exhausted, after which the next call will signal the error.
 */
 
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
+ZEXTERN z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
+                                 gzFile file);
 /*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
+     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 that of fread() implementations in common libraries. This
+   could result in data loss if used with size != 1 when reading a concurrently
+   written file or a non-blocking file. In that case, use size == 1 or gzread()
+   instead.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len);
 /*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 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().
+     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 or
+   if len is 0.  If the write destination is non-blocking, then gzwrite() may
+   return a number of bytes written that is not 0 and less than len.
+
+     If len does not fit in an int, then 0 is returned and nothing is written.
 */
 
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+ZEXTERN z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size,
+                                  z_size_t nitems, gzFile file);
 /*
-     Writes the given null-terminated string to the compressed file, excluding
+     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.
+
+     If writing a concurrently read file or a non-blocking file with size != 1,
+   a partial item could be written, with no way of knowing how much of it was
+   not written, resulting in data loss.  In that case, use size == 1 or
+   gzwrite() instead.
+*/
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+ZEXTERN int ZEXPORTVA gzprintf(gzFile file, const char *format, ...);
+#else
+ZEXTERN int ZEXPORTVA gzprintf();
+#endif
+/*
+     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 that last 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() and
+   vsnprintf() functions were not available. That would only be the case for
+   a non-ANSI C compiler. zlib may have been built without gzprintf() because
+   secure functions were not available and having gzprintf() be insecure was
+   not an option, in which case, gzprintf() returns Z_STREAM_ERROR. All of
+   these possibilities can be determined using zlibCompileFlags().
+
+     If a Z_BUF_ERROR is returned, then nothing was written due to a stall on
+   the non-blocking write destination.
+*/
+
+ZEXTERN int ZEXPORT gzputs(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.
+   The number of characters written may be less than the length of the string
+   if the write destination is non-blocking.
+
+     If the length of the string does not fit in an int, then -1 is returned
+   and nothing is written.
 */
 
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+ZEXTERN char * ZEXPORT gzgets(gzFile file, char *buf, int len);
 /*
-     Reads bytes from the compressed file until len-1 characters are read, or 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 == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
+     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.
+   for end-of-file or in case of error. If some data was read before an error,
+   then that data is returned until exhausted, after which the next call will
+   return NULL to signal the error.
+
+     gzgets can be used on a file being concurrently written, and on a non-
+   blocking device, both as for gzread(). However lines may be broken in the
+   middle, leaving it up to the application to reassemble them as needed.
 */
 
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT gzputc(gzFile file, int c);
 /*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+     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));
+ZEXTERN int ZEXPORT gzgetc(gzFile file);
 /*
-     Reads one byte from the compressed 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.
+     Read and decompress one byte from file. gzgetc returns this byte or -1 in
+   case of end of file or error. If some data was read before an error, then
+   that data is returned until exhausted, after which the next call will return
+   -1 to signal the 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.
+
+     gzgetc can be used to read a gzip file on a non-blocking device. If the
+   input stalls and there is no uncompressed data to return, then gzgetc() will
+   return -1, and errno will be EAGAIN or EWOULDBLOCK. gzread() can then be
+   called again.
 */
 
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT gzungetc(int c, gzFile file);
 /*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
+     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().
+
+     gzungetc(-1, file) will force any pending seek to execute. Then gztell()
+   will report the position, even if the requested seek reached end of file.
+   This can be used to determine the number of uncompressed bytes in a gzip
+   file without having to read it into a buffer.
 */
 
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT gzflush(gzFile file, int flush);
 /*
-     Flushes all pending output into the compressed 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.
+     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
-   concatented gzip streams.
+   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));
+ZEXTERN z_off_t ZEXPORT gzseek(gzFile file,
+                               z_off_t offset, int whence);
 
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
+     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.
+   starting position. For reading or writing, any actual seeking is deferred
+   until the next read or write operation, or close operation when writing.
 
      gzseek returns the resulting offset location as measured in bytes from
    the beginning of the uncompressed stream, or -1 in case of error, in
@@ -1444,52 +1680,52 @@ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
    would be before the current position.
 */
 
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+ZEXTERN int ZEXPORT gzrewind(gzFile file);
 /*
-     Rewinds the given file. This function is supported only for reading.
+     Rewind file. This function is supported only for reading.
 
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT gztell(gzFile file);
 
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed 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().
+     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));
+ZEXTERN z_off_t ZEXPORT gzoffset(gzFile file);
 
-     Returns the current offset in the file being read or written.  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.
+     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));
+ZEXTERN int ZEXPORT gzeof(gzFile file);
 /*
-     Returns true (1) if the end-of-file indicator 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.
+     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));
+ZEXTERN int ZEXPORT gzdirect(gzFile file);
 /*
-     Returns true (1) if file is being copied directly while reading, or false
+     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
@@ -1497,8 +1733,11 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 
      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().
+   is a gzip file. Therefore if gzbuffer() is used, it should be called before
+   gzdirect(). If the input is being written concurrently or the device is non-
+   blocking, then gzdirect() may give a different answer once four bytes of
+   input have been accumulated, which is what is needed to confirm or deny a
+   gzip header. Before this, gzdirect() will return true (1).
 
      When writing, gzdirect() returns true (1) if transparent writing was
    requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
@@ -1508,10 +1747,10 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    gzip file reading and decompression, which may not be desired.)
 */
 
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose(gzFile file);
 /*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
+     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.
@@ -1521,8 +1760,8 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    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));
+ZEXTERN int ZEXPORT gzclose_r(gzFile file);
+ZEXTERN int ZEXPORT gzclose_w(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
@@ -1533,12 +1772,13 @@ ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
    zlib library.
 */
 
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+ZEXTERN const char * ZEXPORT gzerror(gzFile file, int *errnum);
 /*
-     Returns the error message for the last error which occurred on the given
-   compressed 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.
+     Return the error message for the last error which occurred on file.
+   If errnum is not NULL, *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
@@ -1549,9 +1789,9 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
    functions above that do not distinguish those cases in their return values.
 */
 
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+ZEXTERN void ZEXPORT gzclearerr(gzFile file);
 /*
-     Clears the error and end-of-file flags for file.  This is analogous to the
+     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.
 */
@@ -1566,13 +1806,14 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    library.
 */
 
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT adler32(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.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
+   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 CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1585,9 +1826,16 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf,
+                                z_size_t len);
 /*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
+     Same as adler32(), but with a size_t length.  Note that a long is 32 bits
+   on Windows.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine(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
@@ -1597,12 +1845,13 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
    negative, the result has no meaning or utility.
 */
 
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT crc32(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.  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.
+   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:
 
@@ -1614,14 +1863,35 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z(uLong crc, const Bytef *buf,
+                              z_size_t len);
 /*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+     Same as crc32(), but with a size_t length.  Note that a long is 32 bits on
+   Windows.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine(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.
+   len2. len2 must be non-negative, otherwise zero is returned.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
+
+     Return the operator corresponding to length len2, to be used with
+   crc32_combine_op(). len2 must be non-negative, otherwise zero is returned.
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine_op(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.
 */
 
 
@@ -1630,33 +1900,49 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 /* 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));
-#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))
+ZEXTERN int ZEXPORT deflateInit_(z_streamp strm, int level,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateInit_(z_streamp strm,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT deflateInit2_(z_streamp strm, int  level, int  method,
+                                  int windowBits, int memLevel,
+                                  int strategy, const char *version,
+                                  int stream_size);
+ZEXTERN int ZEXPORT inflateInit2_(z_streamp strm, int  windowBits,
+                                  const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateBackInit_(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
 
@@ -1672,14 +1958,14 @@ struct gzFile_s {
     unsigned char *next;
     z_off64_t pos;
 };
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ZEXTERN int ZEXPORT gzgetc_(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))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1689,12 +1975,13 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
  * 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 gzFile ZEXPORT gzopen64(const char *, const char *);
+   ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+   ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+   ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #endif
 
 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
@@ -1705,6 +1992,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    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
@@ -1712,52 +2000,53 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    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 gzFile ZEXPORT gzopen64(const char *, const char *);
+     ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int);
+     ZEXTERN z_off_t ZEXPORT gztell64(gzFile);
+     ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile);
+     ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+     ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_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 gzFile ZEXPORT gzopen(const char *, const char *);
+   ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int);
+   ZEXTERN z_off_t ZEXPORT gztell(gzFile);
+   ZEXTERN z_off_t ZEXPORT gzoffset(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(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 adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
 /* 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 inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+ZEXTERN const char   * ZEXPORT zError(int);
+ZEXTERN int            ZEXPORT inflateSyncPoint(z_streamp);
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table(void);
+ZEXTERN int            ZEXPORT inflateUndermine(z_streamp, int);
+ZEXTERN int            ZEXPORT inflateValidate(z_streamp, int);
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed(z_streamp);
+ZEXTERN int            ZEXPORT inflateResetKeep(z_streamp);
+ZEXTERN int            ZEXPORT deflateResetKeep(z_streamp);
 #if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
+ZEXTERN gzFile         ZEXPORT gzopen_w(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));
+ZEXTERN int            ZEXPORTVA gzvprintf(gzFile file,
+                                           const char *format,
+                                           va_list va);
 #  endif
 #endif
 
diff --git a/Minecraft.Client/Common/zlib/zutil.c b/Minecraft.Client/Common/zlib/zutil.c
index 23d2ebef..0e30c566 100644
--- a/Minecraft.Client/Common/zlib/zutil.c
+++ b/Minecraft.Client/Common/zlib/zutil.c
@@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2026 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -10,30 +10,25 @@
 #  include "gzguts.h"
 #endif
 
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
 z_const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
+    (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(void) {
     return ZLIB_VERSION;
 }
 
-uLong ZEXPORT zlibCompileFlags()
-{
+uLong ZEXPORT zlibCompileFlags(void) {
     uLong flags;
 
     flags = 0;
@@ -61,12 +56,14 @@ uLong ZEXPORT zlibCompileFlags()
     case 8:     flags += 2 << 6;        break;
     default:    flags += 3 << 6;
     }
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
+    /*
 #if defined(ASMV) || defined(ASMINF)
     flags += 1 << 9;
 #endif
+     */
 #ifdef ZLIB_WINAPI
     flags += 1 << 10;
 #endif
@@ -89,42 +86,48 @@ uLong ZEXPORT zlibCompileFlags()
     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
+#   ifdef NO_vsnprintf
+#       ifdef ZLIB_INSECURE
+            flags += 1L << 25;
+#       else
+            flags += 1L << 27;
+#       endif
+#       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
+#   ifdef NO_snprintf
+#       ifdef ZLIB_INSECURE
+            flags += 1L << 25;
+#       else
+            flags += 1L << 27;
+#       endif
+#       ifdef HAS_sprintf_void
+            flags += 1L << 26;
+#       endif
+#   else
+#       ifdef HAS_snprintf_void
+            flags += 1L << 26;
+#       endif
+#   endif
 #endif
     return flags;
 }
 
-#ifdef DEBUG
-
+#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;
-{
+void ZLIB_INTERNAL z_error(char *m) {
     fprintf(stderr, "%s\n", m);
     exit(1);
 }
@@ -133,14 +136,12 @@ void ZLIB_INTERNAL z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
-const char * ZEXPORT zError(err)
-    int err;
-{
+const char * ZEXPORT zError(int err) {
     return ERR_MSG(err);
 }
 
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+#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.
      */
@@ -149,39 +150,33 @@ const char * ZEXPORT zError(err)
 
 #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);
+void ZLIB_INTERNAL zmemcpy(void FAR *dst, const void FAR *src, z_size_t n) {
+    uchf *p = dst;
+    const uchf *q = src;
+    while (n) {
+        *p++ = *q++;
+        n--;
+    }
 }
 
-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;
+int ZLIB_INTERNAL zmemcmp(const void FAR *s1, const void FAR *s2, z_size_t n) {
+    const uchf *p = s1, *q = s2;
+    while (n) {
+        if (*p++ != *q++)
+            return (int)p[-1] - (int)q[-1];
+        n--;
     }
     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);
+void ZLIB_INTERNAL zmemzero(void FAR *b, z_size_t len) {
+    uchf *p = b;
+    while (len) {
+        *p++ = 0;
+        len--;
+    }
 }
+
 #endif
 
 #ifndef Z_SOLO
@@ -217,11 +212,12 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
+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.
      */
@@ -241,9 +237,11 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     int n;
+
+    (void)opaque;
+
     if (*(ush*)&ptr != 0) { /* object < 64K */
         farfree(ptr);
         return;
@@ -259,7 +257,6 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
         next_ptr--;
         return;
     }
-    ptr = opaque; /* just to make some compilers happy */
     Assert(0, "zcfree: ptr not found");
 }
 
@@ -276,15 +273,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
+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)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
+    (void)opaque;
     _hfree(ptr);
 }
 
@@ -296,27 +291,20 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #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));
+extern voidp malloc(uInt size);
+extern voidp calloc(uInt items, uInt size);
+extern void free(voidpf ptr);
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
+voidpf ZLIB_INTERNAL zcalloc(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 ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
+    (void)opaque;
     free(ptr);
-    if (opaque) return; /* make compiler happy */
 }
 
 #endif /* MY_ZCALLOC */
diff --git a/Minecraft.Client/Common/zlib/zutil.h b/Minecraft.Client/Common/zlib/zutil.h
index 24ab06b1..a9bc23ca 100644
--- a/Minecraft.Client/Common/zlib/zutil.h
+++ b/Minecraft.Client/Common/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -29,14 +29,16 @@
 #  include <stdlib.h>
 #endif
 
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* 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) */
+
+extern const char deflate_copyright[];
+extern const char inflate_copyright[];
+extern const char inflate9_copyright[];
 
 typedef unsigned char  uch;
 typedef uch FAR uchf;
@@ -44,17 +46,32 @@ 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 (ULONG_LONG_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_MSG(err) z_errmsg[(err) < -6 || (err) > 2 ? 9 : 2 - (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 */
-
+#if MAX_WBITS < 9 || MAX_WBITS > 15
+#  error MAX_WBITS must be in 9..15
+#endif
 #ifndef DEF_WBITS
 #  define DEF_WBITS MAX_WBITS
 #endif
@@ -98,67 +115,58 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifdef AMIGA
-#  define OS_CODE  0x01
+#  define OS_CODE  1
 #endif
 
 #if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
+#  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  0x05
+#  define OS_CODE  5
 #endif
 
 #ifdef OS2
-#  define OS_CODE  0x06
+#  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  0x07
-#  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
+#if defined(MACOS)
+#  define OS_CODE  7
 #endif
 
-#ifdef TOPS20
-#  define OS_CODE  0x0a
+#if defined(__acorn) || defined(__riscos)
+#  define OS_CODE 13
 #endif
 
-#ifdef WIN32
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
-#    define OS_CODE  0x0b
-#  endif
+#if defined(WIN32) && !defined(__CYGWIN__)
+#  define OS_CODE  10
 #endif
 
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
+#ifdef _BEOS_
+#  define OS_CODE  16
 #endif
 
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
+#ifdef __TOS_OS400__
+#  define OS_CODE 18
 #endif
 
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
+#ifdef __APPLE__
+#  define OS_CODE 19
 #endif
 
 #if defined(__BORLANDC__) && !defined(MSDOS)
@@ -168,16 +176,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #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));
+#ifndef Z_LARGE64
+   ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #endif
 
         /* common defaults */
 
 #ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
+#  define OS_CODE  3     /* assume Unix */
 #endif
 
 #ifndef F_OPEN
@@ -210,16 +218,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    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));
+   void ZLIB_INTERNAL zmemcpy(void FAR *, const void FAR *, z_size_t);
+   int ZLIB_INTERNAL zmemcmp(const void FAR *, const void FAR *, z_size_t);
+   void ZLIB_INTERNAL zmemzero(void FAR *, z_size_t);
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <stdio.h>
    extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
+   extern void ZLIB_INTERNAL z_error(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 ;}
@@ -236,9 +244,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+   voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items,
+                                unsigned size);
+   void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr);
 #endif
 
 #define ZALLOC(strm, items, size) \
@@ -250,4 +258,74 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
 
+#ifdef Z_ONCE
+/*
+  Create a local z_once() function depending on the availability of atomics.
+ */
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+typedef struct {
+    atomic_flag begun;
+    atomic_int done;
+} z_once_t;
+#define Z_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
+  Z_ONCE_INIT.
+ */
+local void z_once(z_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 */
+
+#warning zlib not thread-safe
+
+typedef struct z_once_s {
+    volatile int begun;
+    volatile int done;
+} z_once_t;
+#define Z_ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to limit the period of
+   vulnerability. */
+local int test_and_set(int volatile *flag) {
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+local void z_once(z_once_t *state, void (*init)(void)) {
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif /* ?atomics */
+
+#endif /* Z_ONCE */
+
 #endif /* ZUTIL_H */